Merge pull request #45 from AeneasVerif/son_merge_types

Big cleanup

18 files changed, 1175 insertions, 677 deletions

diff --git a/tests/lean/Array.lean b/tests/lean/Array.lean
index 20f02e97..4832f469 100644
--- a/tests/lean/Array.lean
+++ b/tests/lean/Array.lean
@@ -5,159 +5,187 @@ open Primitives
 
 namespace array
 
-/- [array::AB] -/
+/- [array::AB]
+   Source: 'src/array.rs', lines 3:0-3:11 -/
 inductive AB :=
 | A : AB
 | B : AB
 
 /- [array::incr]: merged forward/backward function
-   (there is a single backward function, and the forward function returns ()) -/
+   (there is a single backward function, and the forward function returns ())
+   Source: 'src/array.rs', lines 8:0-8:24 -/
 def incr (x : U32) : Result U32 :=
   x + 1#u32
 
-/- [array::array_to_shared_slice_]: forward function -/
+/- [array::array_to_shared_slice_]: forward function
+   Source: 'src/array.rs', lines 16:0-16:53 -/
 def array_to_shared_slice_
   (T : Type) (s : Array T 32#usize) : Result (Slice T) :=
   Array.to_slice T 32#usize s
 
-/- [array::array_to_mut_slice_]: forward function -/
+/- [array::array_to_mut_slice_]: forward function
+   Source: 'src/array.rs', lines 21:0-21:58 -/
 def array_to_mut_slice_ (T : Type) (s : Array T 32#usize) : Result (Slice T) :=
   Array.to_slice T 32#usize s
 
-/- [array::array_to_mut_slice_]: backward function 0 -/
+/- [array::array_to_mut_slice_]: backward function 0
+   Source: 'src/array.rs', lines 21:0-21:58 -/
 def array_to_mut_slice__back
   (T : Type) (s : Array T 32#usize) (ret0 : Slice T) :
   Result (Array T 32#usize)
   :=
   Array.from_slice T 32#usize s ret0
 
-/- [array::array_len]: forward function -/
+/- [array::array_len]: forward function
+   Source: 'src/array.rs', lines 25:0-25:40 -/
 def array_len (T : Type) (s : Array T 32#usize) : Result Usize :=
   do
     let s0 ← Array.to_slice T 32#usize s
     let i := Slice.len T s0
     Result.ret i
 
-/- [array::shared_array_len]: forward function -/
+/- [array::shared_array_len]: forward function
+   Source: 'src/array.rs', lines 29:0-29:48 -/
 def shared_array_len (T : Type) (s : Array T 32#usize) : Result Usize :=
   do
     let s0 ← Array.to_slice T 32#usize s
     let i := Slice.len T s0
     Result.ret i
 
-/- [array::shared_slice_len]: forward function -/
+/- [array::shared_slice_len]: forward function
+   Source: 'src/array.rs', lines 33:0-33:44 -/
 def shared_slice_len (T : Type) (s : Slice T) : Result Usize :=
   let i := Slice.len T s
   Result.ret i
 
-/- [array::index_array_shared]: forward function -/
+/- [array::index_array_shared]: forward function
+   Source: 'src/array.rs', lines 37:0-37:57 -/
 def index_array_shared
   (T : Type) (s : Array T 32#usize) (i : Usize) : Result T :=
   Array.index_usize T 32#usize s i
 
-/- [array::index_array_u32]: forward function -/
+/- [array::index_array_u32]: forward function
+   Source: 'src/array.rs', lines 44:0-44:53 -/
 def index_array_u32 (s : Array U32 32#usize) (i : Usize) : Result U32 :=
   Array.index_usize U32 32#usize s i
 
-/- [array::index_array_copy]: forward function -/
+/- [array::index_array_copy]: forward function
+   Source: 'src/array.rs', lines 48:0-48:45 -/
 def index_array_copy (x : Array U32 32#usize) : Result U32 :=
   Array.index_usize U32 32#usize x 0#usize
 
-/- [array::index_mut_array]: forward function -/
+/- [array::index_mut_array]: forward function
+   Source: 'src/array.rs', lines 52:0-52:62 -/
 def index_mut_array (T : Type) (s : Array T 32#usize) (i : Usize) : Result T :=
   Array.index_usize T 32#usize s i
 
-/- [array::index_mut_array]: backward function 0 -/
+/- [array::index_mut_array]: backward function 0
+   Source: 'src/array.rs', lines 52:0-52:62 -/
 def index_mut_array_back
   (T : Type) (s : Array T 32#usize) (i : Usize) (ret0 : T) :
   Result (Array T 32#usize)
   :=
   Array.update_usize T 32#usize s i ret0
 
-/- [array::index_slice]: forward function -/
+/- [array::index_slice]: forward function
+   Source: 'src/array.rs', lines 56:0-56:46 -/
 def index_slice (T : Type) (s : Slice T) (i : Usize) : Result T :=
   Slice.index_usize T s i
 
-/- [array::index_mut_slice]: forward function -/
+/- [array::index_mut_slice]: forward function
+   Source: 'src/array.rs', lines 60:0-60:58 -/
 def index_mut_slice (T : Type) (s : Slice T) (i : Usize) : Result T :=
   Slice.index_usize T s i
 
-/- [array::index_mut_slice]: backward function 0 -/
+/- [array::index_mut_slice]: backward function 0
+   Source: 'src/array.rs', lines 60:0-60:58 -/
 def index_mut_slice_back
   (T : Type) (s : Slice T) (i : Usize) (ret0 : T) : Result (Slice T) :=
   Slice.update_usize T s i ret0
 
-/- [array::slice_subslice_shared_]: forward function -/
+/- [array::slice_subslice_shared_]: forward function
+   Source: 'src/array.rs', lines 64:0-64:70 -/
 def slice_subslice_shared_
   (x : Slice U32) (y : Usize) (z : Usize) : Result (Slice U32) :=
   core.slice.index.Slice.index U32 (core.ops.range.Range Usize)
-    (core.slice.index.Range.coresliceindexSliceIndexInst U32) x
+    (core.slice.index.SliceIndexRangeUsizeSliceTInst U32) x
     { start := y, end_ := z }
 
-/- [array::slice_subslice_mut_]: forward function -/
+/- [array::slice_subslice_mut_]: forward function
+   Source: 'src/array.rs', lines 68:0-68:75 -/
 def slice_subslice_mut_
   (x : Slice U32) (y : Usize) (z : Usize) : Result (Slice U32) :=
   core.slice.index.Slice.index_mut U32 (core.ops.range.Range Usize)
-    (core.slice.index.Range.coresliceindexSliceIndexInst U32) x
+    (core.slice.index.SliceIndexRangeUsizeSliceTInst U32) x
     { start := y, end_ := z }
 
-/- [array::slice_subslice_mut_]: backward function 0 -/
+/- [array::slice_subslice_mut_]: backward function 0
+   Source: 'src/array.rs', lines 68:0-68:75 -/
 def slice_subslice_mut__back
   (x : Slice U32) (y : Usize) (z : Usize) (ret0 : Slice U32) :
   Result (Slice U32)
   :=
   core.slice.index.Slice.index_mut_back U32 (core.ops.range.Range Usize)
-    (core.slice.index.Range.coresliceindexSliceIndexInst U32) x
+    (core.slice.index.SliceIndexRangeUsizeSliceTInst U32) x
     { start := y, end_ := z } ret0
 
-/- [array::array_to_slice_shared_]: forward function -/
+/- [array::array_to_slice_shared_]: forward function
+   Source: 'src/array.rs', lines 72:0-72:54 -/
 def array_to_slice_shared_ (x : Array U32 32#usize) : Result (Slice U32) :=
   Array.to_slice U32 32#usize x
 
-/- [array::array_to_slice_mut_]: forward function -/
+/- [array::array_to_slice_mut_]: forward function
+   Source: 'src/array.rs', lines 76:0-76:59 -/
 def array_to_slice_mut_ (x : Array U32 32#usize) : Result (Slice U32) :=
   Array.to_slice U32 32#usize x
 
-/- [array::array_to_slice_mut_]: backward function 0 -/
+/- [array::array_to_slice_mut_]: backward function 0
+   Source: 'src/array.rs', lines 76:0-76:59 -/
 def array_to_slice_mut__back
   (x : Array U32 32#usize) (ret0 : Slice U32) : Result (Array U32 32#usize) :=
   Array.from_slice U32 32#usize x ret0
 
-/- [array::array_subslice_shared_]: forward function -/
+/- [array::array_subslice_shared_]: forward function
+   Source: 'src/array.rs', lines 80:0-80:74 -/
 def array_subslice_shared_
   (x : Array U32 32#usize) (y : Usize) (z : Usize) : Result (Slice U32) :=
   core.array.Array.index U32 (core.ops.range.Range Usize) 32#usize
-    (core.slice.index.Slice.coreopsindexIndexInst U32 (core.ops.range.Range
-    Usize) (core.slice.index.Range.coresliceindexSliceIndexInst U32)) x
+    (core.ops.index.IndexSliceTIInst U32 (core.ops.range.Range Usize)
+    (core.slice.index.SliceIndexRangeUsizeSliceTInst U32)) x
     { start := y, end_ := z }
 
-/- [array::array_subslice_mut_]: forward function -/
+/- [array::array_subslice_mut_]: forward function
+   Source: 'src/array.rs', lines 84:0-84:79 -/
 def array_subslice_mut_
   (x : Array U32 32#usize) (y : Usize) (z : Usize) : Result (Slice U32) :=
   core.array.Array.index_mut U32 (core.ops.range.Range Usize) 32#usize
-    (core.slice.index.Slice.coreopsindexIndexMutInst U32 (core.ops.range.Range
-    Usize) (core.slice.index.Range.coresliceindexSliceIndexInst U32)) x
+    (core.ops.index.IndexMutSliceTIInst U32 (core.ops.range.Range Usize)
+    (core.slice.index.SliceIndexRangeUsizeSliceTInst U32)) x
     { start := y, end_ := z }
 
-/- [array::array_subslice_mut_]: backward function 0 -/
+/- [array::array_subslice_mut_]: backward function 0
+   Source: 'src/array.rs', lines 84:0-84:79 -/
 def array_subslice_mut__back
   (x : Array U32 32#usize) (y : Usize) (z : Usize) (ret0 : Slice U32) :
   Result (Array U32 32#usize)
   :=
   core.array.Array.index_mut_back U32 (core.ops.range.Range Usize) 32#usize
-    (core.slice.index.Slice.coreopsindexIndexMutInst U32 (core.ops.range.Range
-    Usize) (core.slice.index.Range.coresliceindexSliceIndexInst U32)) x
+    (core.ops.index.IndexMutSliceTIInst U32 (core.ops.range.Range Usize)
+    (core.slice.index.SliceIndexRangeUsizeSliceTInst U32)) x
     { start := y, end_ := z } ret0
 
-/- [array::index_slice_0]: forward function -/
+/- [array::index_slice_0]: forward function
+   Source: 'src/array.rs', lines 88:0-88:38 -/
 def index_slice_0 (T : Type) (s : Slice T) : Result T :=
   Slice.index_usize T s 0#usize
 
-/- [array::index_array_0]: forward function -/
+/- [array::index_array_0]: forward function
+   Source: 'src/array.rs', lines 92:0-92:42 -/
 def index_array_0 (T : Type) (s : Array T 32#usize) : Result T :=
   Array.index_usize T 32#usize s 0#usize
 
-/- [array::index_index_array]: forward function -/
+/- [array::index_index_array]: forward function
+   Source: 'src/array.rs', lines 103:0-103:71 -/
 def index_index_array
   (s : Array (Array U32 32#usize) 32#usize) (i : Usize) (j : Usize) :
   Result U32
@@ -166,7 +194,8 @@ def index_index_array
     let a ← Array.index_usize (Array U32 32#usize) 32#usize s i
     Array.index_usize U32 32#usize a j
 
-/- [array::update_update_array]: forward function -/
+/- [array::update_update_array]: forward function
+   Source: 'src/array.rs', lines 114:0-114:70 -/
 def update_update_array
   (s : Array (Array U32 32#usize) 32#usize) (i : Usize) (j : Usize) :
   Result Unit
@@ -177,28 +206,34 @@ def update_update_array
     let _ ← Array.update_usize (Array U32 32#usize) 32#usize s i a0
     Result.ret ()
 
-/- [array::array_local_deep_copy]: forward function -/
+/- [array::array_local_deep_copy]: forward function
+   Source: 'src/array.rs', lines 118:0-118:43 -/
 def array_local_deep_copy (x : Array U32 32#usize) : Result Unit :=
   Result.ret ()
 
-/- [array::take_array]: forward function -/
+/- [array::take_array]: forward function
+   Source: 'src/array.rs', lines 122:0-122:30 -/
 def take_array (a : Array U32 2#usize) : Result Unit :=
   Result.ret ()
 
-/- [array::take_array_borrow]: forward function -/
+/- [array::take_array_borrow]: forward function
+   Source: 'src/array.rs', lines 123:0-123:38 -/
 def take_array_borrow (a : Array U32 2#usize) : Result Unit :=
   Result.ret ()
 
-/- [array::take_slice]: forward function -/
+/- [array::take_slice]: forward function
+   Source: 'src/array.rs', lines 124:0-124:28 -/
 def take_slice (s : Slice U32) : Result Unit :=
   Result.ret ()
 
 /- [array::take_mut_slice]: merged forward/backward function
-   (there is a single backward function, and the forward function returns ()) -/
+   (there is a single backward function, and the forward function returns ())
+   Source: 'src/array.rs', lines 125:0-125:36 -/
 def take_mut_slice (s : Slice U32) : Result (Slice U32) :=
   Result.ret s
 
-/- [array::take_all]: forward function -/
+/- [array::take_all]: forward function
+   Source: 'src/array.rs', lines 127:0-127:17 -/
 def take_all : Result Unit :=
   do
     let _ ← take_array (Array.make U32 2#usize [ 0#u32, 0#u32 ])
@@ -213,29 +248,35 @@ def take_all : Result Unit :=
       Array.from_slice U32 2#usize (Array.make U32 2#usize [ 0#u32, 0#u32 ]) s1
     Result.ret ()
 
-/- [array::index_array]: forward function -/
+/- [array::index_array]: forward function
+   Source: 'src/array.rs', lines 141:0-141:38 -/
 def index_array (x : Array U32 2#usize) : Result U32 :=
   Array.index_usize U32 2#usize x 0#usize
 
-/- [array::index_array_borrow]: forward function -/
+/- [array::index_array_borrow]: forward function
+   Source: 'src/array.rs', lines 144:0-144:46 -/
 def index_array_borrow (x : Array U32 2#usize) : Result U32 :=
   Array.index_usize U32 2#usize x 0#usize
 
-/- [array::index_slice_u32_0]: forward function -/
+/- [array::index_slice_u32_0]: forward function
+   Source: 'src/array.rs', lines 148:0-148:42 -/
 def index_slice_u32_0 (x : Slice U32) : Result U32 :=
   Slice.index_usize U32 x 0#usize
 
-/- [array::index_mut_slice_u32_0]: forward function -/
+/- [array::index_mut_slice_u32_0]: forward function
+   Source: 'src/array.rs', lines 152:0-152:50 -/
 def index_mut_slice_u32_0 (x : Slice U32) : Result U32 :=
   Slice.index_usize U32 x 0#usize
 
-/- [array::index_mut_slice_u32_0]: backward function 0 -/
+/- [array::index_mut_slice_u32_0]: backward function 0
+   Source: 'src/array.rs', lines 152:0-152:50 -/
 def index_mut_slice_u32_0_back (x : Slice U32) : Result (Slice U32) :=
   do
     let _ ← Slice.index_usize U32 x 0#usize
     Result.ret x
 
-/- [array::index_all]: forward function -/
+/- [array::index_all]: forward function
+   Source: 'src/array.rs', lines 156:0-156:25 -/
 def index_all : Result U32 :=
   do
     let i ← index_array (Array.make U32 2#usize [ 0#u32, 0#u32 ])
@@ -256,24 +297,28 @@ def index_all : Result U32 :=
       Array.from_slice U32 2#usize (Array.make U32 2#usize [ 0#u32, 0#u32 ]) s1
     Result.ret i7
 
-/- [array::update_array]: forward function -/
+/- [array::update_array]: forward function
+   Source: 'src/array.rs', lines 170:0-170:36 -/
 def update_array (x : Array U32 2#usize) : Result Unit :=
   do
     let _ ← Array.update_usize U32 2#usize x 0#usize 1#u32
     Result.ret ()
 
 /- [array::update_array_mut_borrow]: merged forward/backward function
-   (there is a single backward function, and the forward function returns ()) -/
+   (there is a single backward function, and the forward function returns ())
+   Source: 'src/array.rs', lines 173:0-173:48 -/
 def update_array_mut_borrow
   (x : Array U32 2#usize) : Result (Array U32 2#usize) :=
   Array.update_usize U32 2#usize x 0#usize 1#u32
 
 /- [array::update_mut_slice]: merged forward/backward function
-   (there is a single backward function, and the forward function returns ()) -/
+   (there is a single backward function, and the forward function returns ())
+   Source: 'src/array.rs', lines 176:0-176:38 -/
 def update_mut_slice (x : Slice U32) : Result (Slice U32) :=
   Slice.update_usize U32 x 0#usize 1#u32
 
-/- [array::update_all]: forward function -/
+/- [array::update_all]: forward function
+   Source: 'src/array.rs', lines 180:0-180:19 -/
 def update_all : Result Unit :=
   do
     let _ ← update_array (Array.make U32 2#usize [ 0#u32, 0#u32 ])
@@ -283,52 +328,57 @@ def update_all : Result Unit :=
     let _ ← Array.from_slice U32 2#usize x s0
     Result.ret ()
 
-/- [array::range_all]: forward function -/
+/- [array::range_all]: forward function
+   Source: 'src/array.rs', lines 191:0-191:18 -/
 def range_all : Result Unit :=
   do
     let s ←
       core.array.Array.index_mut U32 (core.ops.range.Range Usize) 4#usize
-        (core.slice.index.Slice.coreopsindexIndexMutInst U32
-        (core.ops.range.Range Usize)
-        (core.slice.index.Range.coresliceindexSliceIndexInst U32))
+        (core.ops.index.IndexMutSliceTIInst U32 (core.ops.range.Range Usize)
+        (core.slice.index.SliceIndexRangeUsizeSliceTInst U32))
         (Array.make U32 4#usize [ 0#u32, 0#u32, 0#u32, 0#u32 ])
         { start := 1#usize, end_ := 3#usize }
     let s0 ← update_mut_slice s
     let _ ←
       core.array.Array.index_mut_back U32 (core.ops.range.Range Usize) 4#usize
-        (core.slice.index.Slice.coreopsindexIndexMutInst U32
-        (core.ops.range.Range Usize)
-        (core.slice.index.Range.coresliceindexSliceIndexInst U32))
+        (core.ops.index.IndexMutSliceTIInst U32 (core.ops.range.Range Usize)
+        (core.slice.index.SliceIndexRangeUsizeSliceTInst U32))
         (Array.make U32 4#usize [ 0#u32, 0#u32, 0#u32, 0#u32 ])
         { start := 1#usize, end_ := 3#usize } s0
     Result.ret ()
 
-/- [array::deref_array_borrow]: forward function -/
+/- [array::deref_array_borrow]: forward function
+   Source: 'src/array.rs', lines 200:0-200:46 -/
 def deref_array_borrow (x : Array U32 2#usize) : Result U32 :=
   Array.index_usize U32 2#usize x 0#usize
 
-/- [array::deref_array_mut_borrow]: forward function -/
+/- [array::deref_array_mut_borrow]: forward function
+   Source: 'src/array.rs', lines 205:0-205:54 -/
 def deref_array_mut_borrow (x : Array U32 2#usize) : Result U32 :=
   Array.index_usize U32 2#usize x 0#usize
 
-/- [array::deref_array_mut_borrow]: backward function 0 -/
+/- [array::deref_array_mut_borrow]: backward function 0
+   Source: 'src/array.rs', lines 205:0-205:54 -/
 def deref_array_mut_borrow_back
   (x : Array U32 2#usize) : Result (Array U32 2#usize) :=
   do
     let _ ← Array.index_usize U32 2#usize x 0#usize
     Result.ret x
 
-/- [array::take_array_t]: forward function -/
+/- [array::take_array_t]: forward function
+   Source: 'src/array.rs', lines 213:0-213:31 -/
 def take_array_t (a : Array AB 2#usize) : Result Unit :=
   Result.ret ()
 
-/- [array::non_copyable_array]: forward function -/
+/- [array::non_copyable_array]: forward function
+   Source: 'src/array.rs', lines 215:0-215:27 -/
 def non_copyable_array : Result Unit :=
   do
     let _ ← take_array_t (Array.make AB 2#usize [ AB.A, AB.B ])
     Result.ret ()
 
-/- [array::sum]: loop 0: forward function -/
+/- [array::sum]: loop 0: forward function
+   Source: 'src/array.rs', lines 228:0-236:1 -/
 divergent def sum_loop (s : Slice U32) (sum0 : U32) (i : Usize) : Result U32 :=
   let i0 := Slice.len U32 s
   if i < i0
@@ -340,11 +390,13 @@ divergent def sum_loop (s : Slice U32) (sum0 : U32) (i : Usize) : Result U32 :=
       sum_loop s sum1 i2
   else Result.ret sum0
 
-/- [array::sum]: forward function -/
+/- [array::sum]: forward function
+   Source: 'src/array.rs', lines 228:0-228:28 -/
 def sum (s : Slice U32) : Result U32 :=
   sum_loop s 0#u32 0#usize
 
-/- [array::sum2]: loop 0: forward function -/
+/- [array::sum2]: loop 0: forward function
+   Source: 'src/array.rs', lines 238:0-247:1 -/
 divergent def sum2_loop
   (s : Slice U32) (s2 : Slice U32) (sum0 : U32) (i : Usize) : Result U32 :=
   let i0 := Slice.len U32 s
@@ -359,7 +411,8 @@ divergent def sum2_loop
       sum2_loop s s2 sum1 i4
   else Result.ret sum0
 
-/- [array::sum2]: forward function -/
+/- [array::sum2]: forward function
+   Source: 'src/array.rs', lines 238:0-238:41 -/
 def sum2 (s : Slice U32) (s2 : Slice U32) : Result U32 :=
   let i := Slice.len U32 s
   let i0 := Slice.len U32 s2
@@ -367,7 +420,8 @@ def sum2 (s : Slice U32) (s2 : Slice U32) : Result U32 :=
   then Result.fail Error.panic
   else sum2_loop s s2 0#u32 0#usize
 
-/- [array::f0]: forward function -/
+/- [array::f0]: forward function
+   Source: 'src/array.rs', lines 249:0-249:11 -/
 def f0 : Result Unit :=
   do
     let s ←
@@ -377,7 +431,8 @@ def f0 : Result Unit :=
       Array.from_slice U32 2#usize (Array.make U32 2#usize [ 1#u32, 2#u32 ]) s0
     Result.ret ()
 
-/- [array::f1]: forward function -/
+/- [array::f1]: forward function
+   Source: 'src/array.rs', lines 254:0-254:11 -/
 def f1 : Result Unit :=
   do
     let _ ←
@@ -385,18 +440,21 @@ def f1 : Result Unit :=
         0#usize 1#u32
     Result.ret ()
 
-/- [array::f2]: forward function -/
+/- [array::f2]: forward function
+   Source: 'src/array.rs', lines 259:0-259:17 -/
 def f2 (i : U32) : Result Unit :=
   Result.ret ()
 
-/- [array::f4]: forward function -/
+/- [array::f4]: forward function
+   Source: 'src/array.rs', lines 268:0-268:54 -/
 def f4 (x : Array U32 32#usize) (y : Usize) (z : Usize) : Result (Slice U32) :=
   core.array.Array.index U32 (core.ops.range.Range Usize) 32#usize
-    (core.slice.index.Slice.coreopsindexIndexInst U32 (core.ops.range.Range
-    Usize) (core.slice.index.Range.coresliceindexSliceIndexInst U32)) x
+    (core.ops.index.IndexSliceTIInst U32 (core.ops.range.Range Usize)
+    (core.slice.index.SliceIndexRangeUsizeSliceTInst U32)) x
     { start := y, end_ := z }
 
-/- [array::f3]: forward function -/
+/- [array::f3]: forward function
+   Source: 'src/array.rs', lines 261:0-261:18 -/
 def f3 : Result U32 :=
   do
     let i ←
@@ -409,15 +467,18 @@ def f3 : Result U32 :=
     let s0 ← f4 b 16#usize 18#usize
     sum2 s s0
 
-/- [array::SZ] -/
+/- [array::SZ]
+   Source: 'src/array.rs', lines 272:0-272:19 -/
 def sz_body : Result Usize := Result.ret 32#usize
 def sz_c : Usize := eval_global sz_body (by simp)
 
-/- [array::f5]: forward function -/
+/- [array::f5]: forward function
+   Source: 'src/array.rs', lines 275:0-275:31 -/
 def f5 (x : Array U32 32#usize) : Result U32 :=
   Array.index_usize U32 32#usize x 0#usize
 
-/- [array::ite]: forward function -/
+/- [array::ite]: forward function
+   Source: 'src/array.rs', lines 280:0-280:12 -/
 def ite : Result Unit :=
   do
     let s ←
diff --git a/tests/lean/BetreeMain/Funs.lean b/tests/lean/BetreeMain/Funs.lean
index 0901d449..45548884 100644
--- a/tests/lean/BetreeMain/Funs.lean
+++ b/tests/lean/BetreeMain/Funs.lean
@@ -7,14 +7,16 @@ open Primitives
 
 namespace betree_main
 
-/- [betree_main::betree::load_internal_node]: forward function -/
+/- [betree_main::betree::load_internal_node]: forward function
+   Source: 'src/betree.rs', lines 36:0-36:52 -/
 def betree.load_internal_node
   (id : U64) (st : State) :
   Result (State × (betree.List (U64 × betree.Message)))
   :=
   betree_utils.load_internal_node id st
 
-/- [betree_main::betree::store_internal_node]: forward function -/
+/- [betree_main::betree::store_internal_node]: forward function
+   Source: 'src/betree.rs', lines 41:0-41:60 -/
 def betree.store_internal_node
   (id : U64) (content : betree.List (U64 × betree.Message)) (st : State) :
   Result (State × Unit)
@@ -23,12 +25,14 @@ def betree.store_internal_node
     let (st0, _) ← betree_utils.store_internal_node id content st
     Result.ret (st0, ())
 
-/- [betree_main::betree::load_leaf_node]: forward function -/
+/- [betree_main::betree::load_leaf_node]: forward function
+   Source: 'src/betree.rs', lines 46:0-46:44 -/
 def betree.load_leaf_node
   (id : U64) (st : State) : Result (State × (betree.List (U64 × U64))) :=
   betree_utils.load_leaf_node id st
 
-/- [betree_main::betree::store_leaf_node]: forward function -/
+/- [betree_main::betree::store_leaf_node]: forward function
+   Source: 'src/betree.rs', lines 51:0-51:52 -/
 def betree.store_leaf_node
   (id : U64) (content : betree.List (U64 × U64)) (st : State) :
   Result (State × Unit)
@@ -37,34 +41,40 @@ def betree.store_leaf_node
     let (st0, _) ← betree_utils.store_leaf_node id content st
     Result.ret (st0, ())
 
-/- [betree_main::betree::fresh_node_id]: forward function -/
+/- [betree_main::betree::fresh_node_id]: forward function
+   Source: 'src/betree.rs', lines 55:0-55:48 -/
 def betree.fresh_node_id (counter : U64) : Result U64 :=
   do
     let _ ← counter + 1#u64
     Result.ret counter
 
-/- [betree_main::betree::fresh_node_id]: backward function 0 -/
+/- [betree_main::betree::fresh_node_id]: backward function 0
+   Source: 'src/betree.rs', lines 55:0-55:48 -/
 def betree.fresh_node_id_back (counter : U64) : Result U64 :=
   counter + 1#u64
 
-/- [betree_main::betree::NodeIdCounter::{0}::new]: forward function -/
+/- [betree_main::betree::{betree_main::betree::NodeIdCounter}::new]: forward function
+   Source: 'src/betree.rs', lines 206:4-206:20 -/
 def betree.NodeIdCounter.new : Result betree.NodeIdCounter :=
   Result.ret { next_node_id := 0#u64 }
 
-/- [betree_main::betree::NodeIdCounter::{0}::fresh_id]: forward function -/
+/- [betree_main::betree::{betree_main::betree::NodeIdCounter}::fresh_id]: forward function
+   Source: 'src/betree.rs', lines 210:4-210:36 -/
 def betree.NodeIdCounter.fresh_id (self : betree.NodeIdCounter) : Result U64 :=
   do
     let _ ← self.next_node_id + 1#u64
     Result.ret self.next_node_id
 
-/- [betree_main::betree::NodeIdCounter::{0}::fresh_id]: backward function 0 -/
+/- [betree_main::betree::{betree_main::betree::NodeIdCounter}::fresh_id]: backward function 0
+   Source: 'src/betree.rs', lines 210:4-210:36 -/
 def betree.NodeIdCounter.fresh_id_back
   (self : betree.NodeIdCounter) : Result betree.NodeIdCounter :=
   do
     let i ← self.next_node_id + 1#u64
     Result.ret { next_node_id := i }
 
-/- [betree_main::betree::upsert_update]: forward function -/
+/- [betree_main::betree::upsert_update]: forward function
+   Source: 'src/betree.rs', lines 234:0-234:70 -/
 def betree.upsert_update
   (prev : Option U64) (st : betree.UpsertFunState) : Result U64 :=
   match prev with
@@ -85,7 +95,8 @@ def betree.upsert_update
       then prev0 - v
       else Result.ret 0#u64
 
-/- [betree_main::betree::List::{1}::len]: forward function -/
+/- [betree_main::betree::{betree_main::betree::List<T>#1}::len]: forward function
+   Source: 'src/betree.rs', lines 276:4-276:24 -/
 divergent def betree.List.len (T : Type) (self : betree.List T) : Result U64 :=
   match self with
   | betree.List.Cons t tl => do
@@ -93,7 +104,8 @@ divergent def betree.List.len (T : Type) (self : betree.List T) : Result U64 :=
                                1#u64 + i
   | betree.List.Nil => Result.ret 0#u64
 
-/- [betree_main::betree::List::{1}::split_at]: forward function -/
+/- [betree_main::betree::{betree_main::betree::List<T>#1}::split_at]: forward function
+   Source: 'src/betree.rs', lines 284:4-284:51 -/
 divergent def betree.List.split_at
   (T : Type) (self : betree.List T) (n : U64) :
   Result ((betree.List T) × (betree.List T))
@@ -111,22 +123,25 @@ divergent def betree.List.split_at
         Result.ret (betree.List.Cons hd l, ls1)
     | betree.List.Nil => Result.fail Error.panic
 
-/- [betree_main::betree::List::{1}::push_front]: merged forward/backward function
-   (there is a single backward function, and the forward function returns ()) -/
+/- [betree_main::betree::{betree_main::betree::List<T>#1}::push_front]: merged forward/backward function
+   (there is a single backward function, and the forward function returns ())
+   Source: 'src/betree.rs', lines 299:4-299:34 -/
 def betree.List.push_front
   (T : Type) (self : betree.List T) (x : T) : Result (betree.List T) :=
   let tl := core.mem.replace (betree.List T) self betree.List.Nil
   let l := tl
   Result.ret (betree.List.Cons x l)
 
-/- [betree_main::betree::List::{1}::pop_front]: forward function -/
+/- [betree_main::betree::{betree_main::betree::List<T>#1}::pop_front]: forward function
+   Source: 'src/betree.rs', lines 306:4-306:32 -/
 def betree.List.pop_front (T : Type) (self : betree.List T) : Result T :=
   let ls := core.mem.replace (betree.List T) self betree.List.Nil
   match ls with
   | betree.List.Cons x tl => Result.ret x
   | betree.List.Nil => Result.fail Error.panic
 
-/- [betree_main::betree::List::{1}::pop_front]: backward function 0 -/
+/- [betree_main::betree::{betree_main::betree::List<T>#1}::pop_front]: backward function 0
+   Source: 'src/betree.rs', lines 306:4-306:32 -/
 def betree.List.pop_front_back
   (T : Type) (self : betree.List T) : Result (betree.List T) :=
   let ls := core.mem.replace (betree.List T) self betree.List.Nil
@@ -134,22 +149,25 @@ def betree.List.pop_front_back
   | betree.List.Cons x tl => Result.ret tl
   | betree.List.Nil => Result.fail Error.panic
 
-/- [betree_main::betree::List::{1}::hd]: forward function -/
+/- [betree_main::betree::{betree_main::betree::List<T>#1}::hd]: forward function
+   Source: 'src/betree.rs', lines 318:4-318:22 -/
 def betree.List.hd (T : Type) (self : betree.List T) : Result T :=
   match self with
   | betree.List.Cons hd l => Result.ret hd
   | betree.List.Nil => Result.fail Error.panic
 
-/- [betree_main::betree::List::{2}::head_has_key]: forward function -/
-def betree.List.head_has_key
+/- [betree_main::betree::{betree_main::betree::List<(u64, T)>#2}::head_has_key]: forward function
+   Source: 'src/betree.rs', lines 327:4-327:44 -/
+def betree.ListTupleU64T.head_has_key
   (T : Type) (self : betree.List (U64 × T)) (key : U64) : Result Bool :=
   match self with
   | betree.List.Cons hd l => let (i, _) := hd
                              Result.ret (i = key)
   | betree.List.Nil => Result.ret false
 
-/- [betree_main::betree::List::{2}::partition_at_pivot]: forward function -/
-divergent def betree.List.partition_at_pivot
+/- [betree_main::betree::{betree_main::betree::List<(u64, T)>#2}::partition_at_pivot]: forward function
+   Source: 'src/betree.rs', lines 339:4-339:73 -/
+divergent def betree.ListTupleU64T.partition_at_pivot
   (T : Type) (self : betree.List (U64 × T)) (pivot : U64) :
   Result ((betree.List (U64 × T)) × (betree.List (U64 × T)))
   :=
@@ -160,13 +178,14 @@ divergent def betree.List.partition_at_pivot
     then Result.ret (betree.List.Nil, betree.List.Cons (i, t) tl)
     else
       do
-        let p ← betree.List.partition_at_pivot T tl pivot
+        let p ← betree.ListTupleU64T.partition_at_pivot T tl pivot
         let (ls0, ls1) := p
         let l := ls0
         Result.ret (betree.List.Cons (i, t) l, ls1)
   | betree.List.Nil => Result.ret (betree.List.Nil, betree.List.Nil)
 
-/- [betree_main::betree::Leaf::{3}::split]: forward function -/
+/- [betree_main::betree::{betree_main::betree::Leaf#3}::split]: forward function
+   Source: 'src/betree.rs', lines 359:4-364:17 -/
 def betree.Leaf.split
   (self : betree.Leaf) (content : betree.List (U64 × U64))
   (params : betree.Params) (node_id_cnt : betree.NodeIdCounter) (st : State) :
@@ -186,7 +205,8 @@ def betree.Leaf.split
     let n0 := betree.Node.Leaf { id := id1, size := params.split_size }
     Result.ret (st1, betree.Internal.mk self.id pivot n n0)
 
-/- [betree_main::betree::Leaf::{3}::split]: backward function 2 -/
+/- [betree_main::betree::{betree_main::betree::Leaf#3}::split]: backward function 2
+   Source: 'src/betree.rs', lines 359:4-364:17 -/
 def betree.Leaf.split_back
   (self : betree.Leaf) (content : betree.List (U64 × U64))
   (params : betree.Params) (node_id_cnt : betree.NodeIdCounter) (st : State) :
@@ -203,7 +223,8 @@ def betree.Leaf.split_back
     let _ ← betree.store_leaf_node id1 content1 st0
     betree.NodeIdCounter.fresh_id_back node_id_cnt0
 
-/- [betree_main::betree::Node::{5}::lookup_first_message_for_key]: forward function -/
+/- [betree_main::betree::{betree_main::betree::Node#5}::lookup_first_message_for_key]: forward function
+   Source: 'src/betree.rs', lines 789:4-792:34 -/
 divergent def betree.Node.lookup_first_message_for_key
   (key : U64) (msgs : betree.List (U64 × betree.Message)) :
   Result (betree.List (U64 × betree.Message))
@@ -216,7 +237,8 @@ divergent def betree.Node.lookup_first_message_for_key
     else betree.Node.lookup_first_message_for_key key next_msgs
   | betree.List.Nil => Result.ret betree.List.Nil
 
-/- [betree_main::betree::Node::{5}::lookup_first_message_for_key]: backward function 0 -/
+/- [betree_main::betree::{betree_main::betree::Node#5}::lookup_first_message_for_key]: backward function 0
+   Source: 'src/betree.rs', lines 789:4-792:34 -/
 divergent def betree.Node.lookup_first_message_for_key_back
   (key : U64) (msgs : betree.List (U64 × betree.Message))
   (ret0 : betree.List (U64 × betree.Message)) :
@@ -234,14 +256,15 @@ divergent def betree.Node.lookup_first_message_for_key_back
         Result.ret (betree.List.Cons (i, m) next_msgs0)
   | betree.List.Nil => Result.ret ret0
 
-/- [betree_main::betree::Node::{5}::apply_upserts]: forward function -/
+/- [betree_main::betree::{betree_main::betree::Node#5}::apply_upserts]: forward function
+   Source: 'src/betree.rs', lines 819:4-819:90 -/
 divergent def betree.Node.apply_upserts
   (msgs : betree.List (U64 × betree.Message)) (prev : Option U64) (key : U64)
   (st : State) :
   Result (State × U64)
   :=
   do
-    let b ← betree.List.head_has_key betree.Message msgs key
+    let b ← betree.ListTupleU64T.head_has_key betree.Message msgs key
     if b
     then
       do
@@ -264,14 +287,15 @@ divergent def betree.Node.apply_upserts
             betree.Message.Insert v)
         Result.ret (st0, v)
 
-/- [betree_main::betree::Node::{5}::apply_upserts]: backward function 0 -/
+/- [betree_main::betree::{betree_main::betree::Node#5}::apply_upserts]: backward function 0
+   Source: 'src/betree.rs', lines 819:4-819:90 -/
 divergent def betree.Node.apply_upserts_back
   (msgs : betree.List (U64 × betree.Message)) (prev : Option U64) (key : U64)
   (st : State) :
   Result (betree.List (U64 × betree.Message))
   :=
   do
-    let b ← betree.List.head_has_key betree.Message msgs key
+    let b ← betree.ListTupleU64T.head_has_key betree.Message msgs key
     if b
     then
       do
@@ -292,7 +316,8 @@ divergent def betree.Node.apply_upserts_back
         betree.List.push_front (U64 × betree.Message) msgs (key,
           betree.Message.Insert v)
 
-/- [betree_main::betree::Node::{5}::lookup_in_bindings]: forward function -/
+/- [betree_main::betree::{betree_main::betree::Node#5}::lookup_in_bindings]: forward function
+   Source: 'src/betree.rs', lines 636:4-636:80 -/
 divergent def betree.Node.lookup_in_bindings
   (key : U64) (bindings : betree.List (U64 × U64)) : Result (Option U64) :=
   match bindings with
@@ -306,7 +331,8 @@ divergent def betree.Node.lookup_in_bindings
       else betree.Node.lookup_in_bindings key tl
   | betree.List.Nil => Result.ret none
 
-/- [betree_main::betree::Internal::{4}::lookup_in_children]: forward function -/
+/- [betree_main::betree::{betree_main::betree::Internal#4}::lookup_in_children]: forward function
+   Source: 'src/betree.rs', lines 395:4-395:63 -/
 mutual divergent def betree.Internal.lookup_in_children
   (self : betree.Internal) (key : U64) (st : State) :
   Result (State × (Option U64))
@@ -316,7 +342,8 @@ mutual divergent def betree.Internal.lookup_in_children
   then betree.Node.lookup n key st
   else betree.Node.lookup n0 key st
 
-/- [betree_main::betree::Internal::{4}::lookup_in_children]: backward function 0 -/
+/- [betree_main::betree::{betree_main::betree::Internal#4}::lookup_in_children]: backward function 0
+   Source: 'src/betree.rs', lines 395:4-395:63 -/
 divergent def betree.Internal.lookup_in_children_back
   (self : betree.Internal) (key : U64) (st : State) : Result betree.Internal :=
   let ⟨ i, i0, n, n0 ⟩ := self
@@ -330,7 +357,8 @@ divergent def betree.Internal.lookup_in_children_back
       let n1 ← betree.Node.lookup_back n0 key st
       Result.ret (betree.Internal.mk i i0 n n1)
 
-/- [betree_main::betree::Node::{5}::lookup]: forward function -/
+/- [betree_main::betree::{betree_main::betree::Node#5}::lookup]: forward function
+   Source: 'src/betree.rs', lines 709:4-709:58 -/
 divergent def betree.Node.lookup
   (self : betree.Node) (key : U64) (st : State) :
   Result (State × (Option U64))
@@ -402,7 +430,8 @@ divergent def betree.Node.lookup
       let o ← betree.Node.lookup_in_bindings key bindings
       Result.ret (st0, o)
 
-/- [betree_main::betree::Node::{5}::lookup]: backward function 0 -/
+/- [betree_main::betree::{betree_main::betree::Node#5}::lookup]: backward function 0
+   Source: 'src/betree.rs', lines 709:4-709:58 -/
 divergent def betree.Node.lookup_back
   (self : betree.Node) (key : U64) (st : State) : Result betree.Node :=
   match self with
@@ -475,8 +504,9 @@ divergent def betree.Node.lookup_back
 
 end
 
-/- [betree_main::betree::Node::{5}::filter_messages_for_key]: merged forward/backward function
-   (there is a single backward function, and the forward function returns ()) -/
+/- [betree_main::betree::{betree_main::betree::Node#5}::filter_messages_for_key]: merged forward/backward function
+   (there is a single backward function, and the forward function returns ())
+   Source: 'src/betree.rs', lines 674:4-674:77 -/
 divergent def betree.Node.filter_messages_for_key
   (key : U64) (msgs : betree.List (U64 × betree.Message)) :
   Result (betree.List (U64 × betree.Message))
@@ -494,7 +524,8 @@ divergent def betree.Node.filter_messages_for_key
     else Result.ret (betree.List.Cons (k, m) l)
   | betree.List.Nil => Result.ret betree.List.Nil
 
-/- [betree_main::betree::Node::{5}::lookup_first_message_after_key]: forward function -/
+/- [betree_main::betree::{betree_main::betree::Node#5}::lookup_first_message_after_key]: forward function
+   Source: 'src/betree.rs', lines 689:4-692:34 -/
 divergent def betree.Node.lookup_first_message_after_key
   (key : U64) (msgs : betree.List (U64 × betree.Message)) :
   Result (betree.List (U64 × betree.Message))
@@ -507,7 +538,8 @@ divergent def betree.Node.lookup_first_message_after_key
     else Result.ret (betree.List.Cons (k, m) next_msgs)
   | betree.List.Nil => Result.ret betree.List.Nil
 
-/- [betree_main::betree::Node::{5}::lookup_first_message_after_key]: backward function 0 -/
+/- [betree_main::betree::{betree_main::betree::Node#5}::lookup_first_message_after_key]: backward function 0
+   Source: 'src/betree.rs', lines 689:4-692:34 -/
 divergent def betree.Node.lookup_first_message_after_key_back
   (key : U64) (msgs : betree.List (U64 × betree.Message))
   (ret0 : betree.List (U64 × betree.Message)) :
@@ -525,8 +557,9 @@ divergent def betree.Node.lookup_first_message_after_key_back
     else Result.ret ret0
   | betree.List.Nil => Result.ret ret0
 
-/- [betree_main::betree::Node::{5}::apply_to_internal]: merged forward/backward function
-   (there is a single backward function, and the forward function returns ()) -/
+/- [betree_main::betree::{betree_main::betree::Node#5}::apply_to_internal]: merged forward/backward function
+   (there is a single backward function, and the forward function returns ())
+   Source: 'src/betree.rs', lines 521:4-521:89 -/
 def betree.Node.apply_to_internal
   (msgs : betree.List (U64 × betree.Message)) (key : U64)
   (new_msg : betree.Message) :
@@ -534,7 +567,7 @@ def betree.Node.apply_to_internal
   :=
   do
     let msgs0 ← betree.Node.lookup_first_message_for_key key msgs
-    let b ← betree.List.head_has_key betree.Message msgs0 key
+    let b ← betree.ListTupleU64T.head_has_key betree.Message msgs0 key
     if b
     then
       match new_msg with
@@ -591,8 +624,9 @@ def betree.Node.apply_to_internal
           betree.List.push_front (U64 × betree.Message) msgs0 (key, new_msg)
         betree.Node.lookup_first_message_for_key_back key msgs msgs1
 
-/- [betree_main::betree::Node::{5}::apply_messages_to_internal]: merged forward/backward function
-   (there is a single backward function, and the forward function returns ()) -/
+/- [betree_main::betree::{betree_main::betree::Node#5}::apply_messages_to_internal]: merged forward/backward function
+   (there is a single backward function, and the forward function returns ())
+   Source: 'src/betree.rs', lines 502:4-505:5 -/
 divergent def betree.Node.apply_messages_to_internal
   (msgs : betree.List (U64 × betree.Message))
   (new_msgs : betree.List (U64 × betree.Message)) :
@@ -606,7 +640,8 @@ divergent def betree.Node.apply_messages_to_internal
       betree.Node.apply_messages_to_internal msgs0 new_msgs_tl
   | betree.List.Nil => Result.ret msgs
 
-/- [betree_main::betree::Node::{5}::lookup_mut_in_bindings]: forward function -/
+/- [betree_main::betree::{betree_main::betree::Node#5}::lookup_mut_in_bindings]: forward function
+   Source: 'src/betree.rs', lines 653:4-656:32 -/
 divergent def betree.Node.lookup_mut_in_bindings
   (key : U64) (bindings : betree.List (U64 × U64)) :
   Result (betree.List (U64 × U64))
@@ -619,7 +654,8 @@ divergent def betree.Node.lookup_mut_in_bindings
     else betree.Node.lookup_mut_in_bindings key tl
   | betree.List.Nil => Result.ret betree.List.Nil
 
-/- [betree_main::betree::Node::{5}::lookup_mut_in_bindings]: backward function 0 -/
+/- [betree_main::betree::{betree_main::betree::Node#5}::lookup_mut_in_bindings]: backward function 0
+   Source: 'src/betree.rs', lines 653:4-656:32 -/
 divergent def betree.Node.lookup_mut_in_bindings_back
   (key : U64) (bindings : betree.List (U64 × U64))
   (ret0 : betree.List (U64 × U64)) :
@@ -636,8 +672,9 @@ divergent def betree.Node.lookup_mut_in_bindings_back
         Result.ret (betree.List.Cons (i, i0) tl0)
   | betree.List.Nil => Result.ret ret0
 
-/- [betree_main::betree::Node::{5}::apply_to_leaf]: merged forward/backward function
-   (there is a single backward function, and the forward function returns ()) -/
+/- [betree_main::betree::{betree_main::betree::Node#5}::apply_to_leaf]: merged forward/backward function
+   (there is a single backward function, and the forward function returns ())
+   Source: 'src/betree.rs', lines 460:4-460:87 -/
 def betree.Node.apply_to_leaf
   (bindings : betree.List (U64 × U64)) (key : U64) (new_msg : betree.Message)
   :
@@ -645,7 +682,7 @@ def betree.Node.apply_to_leaf
   :=
   do
     let bindings0 ← betree.Node.lookup_mut_in_bindings key bindings
-    let b ← betree.List.head_has_key U64 bindings0 key
+    let b ← betree.ListTupleU64T.head_has_key U64 bindings0 key
     if b
     then
       do
@@ -685,8 +722,9 @@ def betree.Node.apply_to_leaf
             betree.List.push_front (U64 × U64) bindings0 (key, v)
           betree.Node.lookup_mut_in_bindings_back key bindings bindings1
 
-/- [betree_main::betree::Node::{5}::apply_messages_to_leaf]: merged forward/backward function
-   (there is a single backward function, and the forward function returns ()) -/
+/- [betree_main::betree::{betree_main::betree::Node#5}::apply_messages_to_leaf]: merged forward/backward function
+   (there is a single backward function, and the forward function returns ())
+   Source: 'src/betree.rs', lines 444:4-447:5 -/
 divergent def betree.Node.apply_messages_to_leaf
   (bindings : betree.List (U64 × U64))
   (new_msgs : betree.List (U64 × betree.Message)) :
@@ -700,7 +738,8 @@ divergent def betree.Node.apply_messages_to_leaf
       betree.Node.apply_messages_to_leaf bindings0 new_msgs_tl
   | betree.List.Nil => Result.ret bindings
 
-/- [betree_main::betree::Internal::{4}::flush]: forward function -/
+/- [betree_main::betree::{betree_main::betree::Internal#4}::flush]: forward function
+   Source: 'src/betree.rs', lines 410:4-415:26 -/
 mutual divergent def betree.Internal.flush
   (self : betree.Internal) (params : betree.Params)
   (node_id_cnt : betree.NodeIdCounter)
@@ -709,7 +748,7 @@ mutual divergent def betree.Internal.flush
   :=
   do
     let ⟨ _, i, n, n0 ⟩ := self
-    let p ← betree.List.partition_at_pivot betree.Message content i
+    let p ← betree.ListTupleU64T.partition_at_pivot betree.Message content i
     let (msgs_left, msgs_right) := p
     let len_left ← betree.List.len (U64 × betree.Message) msgs_left
     if len_left >= params.min_flush_size
@@ -738,7 +777,8 @@ mutual divergent def betree.Internal.flush
           betree.Node.apply_messages_back n0 params node_id_cnt msgs_right st
         Result.ret (st0, msgs_left)
 
-/- [betree_main::betree::Internal::{4}::flush]: backward function 0 -/
+/- [betree_main::betree::{betree_main::betree::Internal#4}::flush]: backward function 0
+   Source: 'src/betree.rs', lines 410:4-415:26 -/
 divergent def betree.Internal.flush_back
   (self : betree.Internal) (params : betree.Params)
   (node_id_cnt : betree.NodeIdCounter)
@@ -747,7 +787,7 @@ divergent def betree.Internal.flush_back
   :=
   do
     let ⟨ i, i0, n, n0 ⟩ := self
-    let p ← betree.List.partition_at_pivot betree.Message content i0
+    let p ← betree.ListTupleU64T.partition_at_pivot betree.Message content i0
     let (msgs_left, msgs_right) := p
     let len_left ← betree.List.len (U64 × betree.Message) msgs_left
     if len_left >= params.min_flush_size
@@ -772,7 +812,8 @@ divergent def betree.Internal.flush_back
           betree.Node.apply_messages_back n0 params node_id_cnt msgs_right st
         Result.ret (betree.Internal.mk i i0 n n1, node_id_cnt0)
 
-/- [betree_main::betree::Node::{5}::apply_messages]: forward function -/
+/- [betree_main::betree::{betree_main::betree::Node#5}::apply_messages]: forward function
+   Source: 'src/betree.rs', lines 588:4-593:5 -/
 divergent def betree.Node.apply_messages
   (self : betree.Node) (params : betree.Params)
   (node_id_cnt : betree.NodeIdCounter)
@@ -820,7 +861,8 @@ divergent def betree.Node.apply_messages
           let (st1, _) ← betree.store_leaf_node node.id content0 st0
           Result.ret (st1, ())
 
-/- [betree_main::betree::Node::{5}::apply_messages]: backward function 0 -/
+/- [betree_main::betree::{betree_main::betree::Node#5}::apply_messages]: backward function 0
+   Source: 'src/betree.rs', lines 588:4-593:5 -/
 divergent def betree.Node.apply_messages_back
   (self : betree.Node) (params : betree.Params)
   (node_id_cnt : betree.NodeIdCounter)
@@ -874,7 +916,8 @@ divergent def betree.Node.apply_messages_back
 
 end
 
-/- [betree_main::betree::Node::{5}::apply]: forward function -/
+/- [betree_main::betree::{betree_main::betree::Node#5}::apply]: forward function
+   Source: 'src/betree.rs', lines 576:4-582:5 -/
 def betree.Node.apply
   (self : betree.Node) (params : betree.Params)
   (node_id_cnt : betree.NodeIdCounter) (key : U64) (new_msg : betree.Message)
@@ -891,7 +934,8 @@ def betree.Node.apply
         (key, new_msg) l) st
     Result.ret (st0, ())
 
-/- [betree_main::betree::Node::{5}::apply]: backward function 0 -/
+/- [betree_main::betree::{betree_main::betree::Node#5}::apply]: backward function 0
+   Source: 'src/betree.rs', lines 576:4-582:5 -/
 def betree.Node.apply_back
   (self : betree.Node) (params : betree.Params)
   (node_id_cnt : betree.NodeIdCounter) (key : U64) (new_msg : betree.Message)
@@ -902,7 +946,8 @@ def betree.Node.apply_back
   betree.Node.apply_messages_back self params node_id_cnt (betree.List.Cons
     (key, new_msg) l) st
 
-/- [betree_main::betree::BeTree::{6}::new]: forward function -/
+/- [betree_main::betree::{betree_main::betree::BeTree#6}::new]: forward function
+   Source: 'src/betree.rs', lines 849:4-849:60 -/
 def betree.BeTree.new
   (min_flush_size : U64) (split_size : U64) (st : State) :
   Result (State × betree.BeTree)
@@ -920,7 +965,8 @@ def betree.BeTree.new
         root := (betree.Node.Leaf { id := id, size := 0#u64 })
       })
 
-/- [betree_main::betree::BeTree::{6}::apply]: forward function -/
+/- [betree_main::betree::{betree_main::betree::BeTree#6}::apply]: forward function
+   Source: 'src/betree.rs', lines 868:4-868:47 -/
 def betree.BeTree.apply
   (self : betree.BeTree) (key : U64) (msg : betree.Message) (st : State) :
   Result (State × Unit)
@@ -932,7 +978,8 @@ def betree.BeTree.apply
       betree.Node.apply_back self.root self.params self.node_id_cnt key msg st
     Result.ret (st0, ())
 
-/- [betree_main::betree::BeTree::{6}::apply]: backward function 0 -/
+/- [betree_main::betree::{betree_main::betree::BeTree#6}::apply]: backward function 0
+   Source: 'src/betree.rs', lines 868:4-868:47 -/
 def betree.BeTree.apply_back
   (self : betree.BeTree) (key : U64) (msg : betree.Message) (st : State) :
   Result betree.BeTree
@@ -942,7 +989,8 @@ def betree.BeTree.apply_back
       betree.Node.apply_back self.root self.params self.node_id_cnt key msg st
     Result.ret { self with node_id_cnt := nic, root := n }
 
-/- [betree_main::betree::BeTree::{6}::insert]: forward function -/
+/- [betree_main::betree::{betree_main::betree::BeTree#6}::insert]: forward function
+   Source: 'src/betree.rs', lines 874:4-874:52 -/
 def betree.BeTree.insert
   (self : betree.BeTree) (key : U64) (value : U64) (st : State) :
   Result (State × Unit)
@@ -954,14 +1002,16 @@ def betree.BeTree.insert
       betree.BeTree.apply_back self key (betree.Message.Insert value) st
     Result.ret (st0, ())
 
-/- [betree_main::betree::BeTree::{6}::insert]: backward function 0 -/
+/- [betree_main::betree::{betree_main::betree::BeTree#6}::insert]: backward function 0
+   Source: 'src/betree.rs', lines 874:4-874:52 -/
 def betree.BeTree.insert_back
   (self : betree.BeTree) (key : U64) (value : U64) (st : State) :
   Result betree.BeTree
   :=
   betree.BeTree.apply_back self key (betree.Message.Insert value) st
 
-/- [betree_main::betree::BeTree::{6}::delete]: forward function -/
+/- [betree_main::betree::{betree_main::betree::BeTree#6}::delete]: forward function
+   Source: 'src/betree.rs', lines 880:4-880:38 -/
 def betree.BeTree.delete
   (self : betree.BeTree) (key : U64) (st : State) : Result (State × Unit) :=
   do
@@ -969,12 +1019,14 @@ def betree.BeTree.delete
     let _ ← betree.BeTree.apply_back self key betree.Message.Delete st
     Result.ret (st0, ())
 
-/- [betree_main::betree::BeTree::{6}::delete]: backward function 0 -/
+/- [betree_main::betree::{betree_main::betree::BeTree#6}::delete]: backward function 0
+   Source: 'src/betree.rs', lines 880:4-880:38 -/
 def betree.BeTree.delete_back
   (self : betree.BeTree) (key : U64) (st : State) : Result betree.BeTree :=
   betree.BeTree.apply_back self key betree.Message.Delete st
 
-/- [betree_main::betree::BeTree::{6}::upsert]: forward function -/
+/- [betree_main::betree::{betree_main::betree::BeTree#6}::upsert]: forward function
+   Source: 'src/betree.rs', lines 886:4-886:59 -/
 def betree.BeTree.upsert
   (self : betree.BeTree) (key : U64) (upd : betree.UpsertFunState) (st : State)
   :
@@ -986,7 +1038,8 @@ def betree.BeTree.upsert
     let _ ← betree.BeTree.apply_back self key (betree.Message.Upsert upd) st
     Result.ret (st0, ())
 
-/- [betree_main::betree::BeTree::{6}::upsert]: backward function 0 -/
+/- [betree_main::betree::{betree_main::betree::BeTree#6}::upsert]: backward function 0
+   Source: 'src/betree.rs', lines 886:4-886:59 -/
 def betree.BeTree.upsert_back
   (self : betree.BeTree) (key : U64) (upd : betree.UpsertFunState) (st : State)
   :
@@ -994,21 +1047,24 @@ def betree.BeTree.upsert_back
   :=
   betree.BeTree.apply_back self key (betree.Message.Upsert upd) st
 
-/- [betree_main::betree::BeTree::{6}::lookup]: forward function -/
+/- [betree_main::betree::{betree_main::betree::BeTree#6}::lookup]: forward function
+   Source: 'src/betree.rs', lines 895:4-895:62 -/
 def betree.BeTree.lookup
   (self : betree.BeTree) (key : U64) (st : State) :
   Result (State × (Option U64))
   :=
   betree.Node.lookup self.root key st
 
-/- [betree_main::betree::BeTree::{6}::lookup]: backward function 0 -/
+/- [betree_main::betree::{betree_main::betree::BeTree#6}::lookup]: backward function 0
+   Source: 'src/betree.rs', lines 895:4-895:62 -/
 def betree.BeTree.lookup_back
   (self : betree.BeTree) (key : U64) (st : State) : Result betree.BeTree :=
   do
     let n ← betree.Node.lookup_back self.root key st
     Result.ret { self with root := n }
 
-/- [betree_main::main]: forward function -/
+/- [betree_main::main]: forward function
+   Source: 'src/betree_main.rs', lines 5:0-5:9 -/
 def main : Result Unit :=
   Result.ret ()
 
diff --git a/tests/lean/BetreeMain/FunsExternal_Template.lean b/tests/lean/BetreeMain/FunsExternal_Template.lean
index 430d2dda..95f88873 100644
--- a/tests/lean/BetreeMain/FunsExternal_Template.lean
+++ b/tests/lean/BetreeMain/FunsExternal_Template.lean
@@ -6,25 +6,30 @@ import BetreeMain.Types
 open Primitives
 open betree_main
 
-/- [betree_main::betree_utils::load_internal_node]: forward function -/
+/- [betree_main::betree_utils::load_internal_node]: forward function
+   Source: 'src/betree_utils.rs', lines 98:0-98:63 -/
 axiom betree_utils.load_internal_node
   : U64 → State → Result (State × (betree.List (U64 × betree.Message)))
 
-/- [betree_main::betree_utils::store_internal_node]: forward function -/
+/- [betree_main::betree_utils::store_internal_node]: forward function
+   Source: 'src/betree_utils.rs', lines 115:0-115:71 -/
 axiom betree_utils.store_internal_node
   :
   U64 → betree.List (U64 × betree.Message) → State → Result (State ×
     Unit)
 
-/- [betree_main::betree_utils::load_leaf_node]: forward function -/
+/- [betree_main::betree_utils::load_leaf_node]: forward function
+   Source: 'src/betree_utils.rs', lines 132:0-132:55 -/
 axiom betree_utils.load_leaf_node
   : U64 → State → Result (State × (betree.List (U64 × U64)))
 
-/- [betree_main::betree_utils::store_leaf_node]: forward function -/
+/- [betree_main::betree_utils::store_leaf_node]: forward function
+   Source: 'src/betree_utils.rs', lines 145:0-145:63 -/
 axiom betree_utils.store_leaf_node
   : U64 → betree.List (U64 × U64) → State → Result (State × Unit)
 
-/- [core::option::Option::{0}::unwrap]: forward function -/
+/- [core::option::{core::option::Option<T>}::unwrap]: forward function
+   Source: '/rustc/d59363ad0b6391b7fc5bbb02c9ccf9300eef3753/library/core/src/option.rs', lines 932:4-932:34 -/
 axiom core.option.Option.unwrap
   (T : Type) : Option T → State → Result (State × T)
 
diff --git a/tests/lean/BetreeMain/Types.lean b/tests/lean/BetreeMain/Types.lean
index 2f5de6a0..6e528437 100644
--- a/tests/lean/BetreeMain/Types.lean
+++ b/tests/lean/BetreeMain/Types.lean
@@ -5,50 +5,59 @@ open Primitives
 
 namespace betree_main
 
-/- [betree_main::betree::List] -/
+/- [betree_main::betree::List]
+   Source: 'src/betree.rs', lines 17:0-17:23 -/
 inductive betree.List (T : Type) :=
 | Cons : T → betree.List T → betree.List T
 | Nil : betree.List T
 
-/- [betree_main::betree::UpsertFunState] -/
+/- [betree_main::betree::UpsertFunState]
+   Source: 'src/betree.rs', lines 63:0-63:23 -/
 inductive betree.UpsertFunState :=
 | Add : U64 → betree.UpsertFunState
 | Sub : U64 → betree.UpsertFunState
 
-/- [betree_main::betree::Message] -/
+/- [betree_main::betree::Message]
+   Source: 'src/betree.rs', lines 69:0-69:23 -/
 inductive betree.Message :=
 | Insert : U64 → betree.Message
 | Delete : betree.Message
 | Upsert : betree.UpsertFunState → betree.Message
 
-/- [betree_main::betree::Leaf] -/
+/- [betree_main::betree::Leaf]
+   Source: 'src/betree.rs', lines 167:0-167:11 -/
 structure betree.Leaf where
   id : U64
   size : U64
 
 mutual
 
-/- [betree_main::betree::Internal] -/
+/- [betree_main::betree::Internal]
+   Source: 'src/betree.rs', lines 156:0-156:15 -/
 inductive betree.Internal :=
 | mk : U64 → U64 → betree.Node → betree.Node → betree.Internal
 
-/- [betree_main::betree::Node] -/
+/- [betree_main::betree::Node]
+   Source: 'src/betree.rs', lines 179:0-179:9 -/
 inductive betree.Node :=
 | Internal : betree.Internal → betree.Node
 | Leaf : betree.Leaf → betree.Node
 
 end
 
-/- [betree_main::betree::Params] -/
+/- [betree_main::betree::Params]
+   Source: 'src/betree.rs', lines 187:0-187:13 -/
 structure betree.Params where
   min_flush_size : U64
   split_size : U64
 
-/- [betree_main::betree::NodeIdCounter] -/
+/- [betree_main::betree::NodeIdCounter]
+   Source: 'src/betree.rs', lines 201:0-201:20 -/
 structure betree.NodeIdCounter where
   next_node_id : U64
 
-/- [betree_main::betree::BeTree] -/
+/- [betree_main::betree::BeTree]
+   Source: 'src/betree.rs', lines 218:0-218:17 -/
 structure betree.BeTree where
   params : betree.Params
   node_id_cnt : betree.NodeIdCounter
diff --git a/tests/lean/Constants.lean b/tests/lean/Constants.lean
index bd3a07b7..80864427 100644
--- a/tests/lean/Constants.lean
+++ b/tests/lean/Constants.lean
@@ -5,119 +5,147 @@ open Primitives
 
 namespace constants
 
-/- [constants::X0] -/
+/- [constants::X0]
+   Source: 'src/constants.rs', lines 5:0-5:17 -/
 def x0_body : Result U32 := Result.ret 0#u32
 def x0_c : U32 := eval_global x0_body (by simp)
 
-/- [constants::X1] -/
+/- [constants::X1]
+   Source: 'src/constants.rs', lines 7:0-7:17 -/
 def x1_body : Result U32 := Result.ret core_u32_max
 def x1_c : U32 := eval_global x1_body (by simp)
 
-/- [constants::X2] -/
+/- [constants::X2]
+   Source: 'src/constants.rs', lines 10:0-10:17 -/
 def x2_body : Result U32 := Result.ret 3#u32
 def x2_c : U32 := eval_global x2_body (by simp)
 
-/- [constants::incr]: forward function -/
+/- [constants::incr]: forward function
+   Source: 'src/constants.rs', lines 17:0-17:32 -/
 def incr (n : U32) : Result U32 :=
   n + 1#u32
 
-/- [constants::X3] -/
+/- [constants::X3]
+   Source: 'src/constants.rs', lines 15:0-15:17 -/
 def x3_body : Result U32 := incr 32#u32
 def x3_c : U32 := eval_global x3_body (by simp)
 
-/- [constants::mk_pair0]: forward function -/
+/- [constants::mk_pair0]: forward function
+   Source: 'src/constants.rs', lines 23:0-23:51 -/
 def mk_pair0 (x : U32) (y : U32) : Result (U32 × U32) :=
   Result.ret (x, y)
 
-/- [constants::Pair] -/
+/- [constants::Pair]
+   Source: 'src/constants.rs', lines 36:0-36:23 -/
 structure Pair (T1 T2 : Type) where
   x : T1
   y : T2
 
-/- [constants::mk_pair1]: forward function -/
+/- [constants::mk_pair1]: forward function
+   Source: 'src/constants.rs', lines 27:0-27:55 -/
 def mk_pair1 (x : U32) (y : U32) : Result (Pair U32 U32) :=
   Result.ret { x := x, y := y }
 
-/- [constants::P0] -/
+/- [constants::P0]
+   Source: 'src/constants.rs', lines 31:0-31:24 -/
 def p0_body : Result (U32 × U32) := mk_pair0 0#u32 1#u32
 def p0_c : (U32 × U32) := eval_global p0_body (by simp)
 
-/- [constants::P1] -/
+/- [constants::P1]
+   Source: 'src/constants.rs', lines 32:0-32:28 -/
 def p1_body : Result (Pair U32 U32) := mk_pair1 0#u32 1#u32
 def p1_c : Pair U32 U32 := eval_global p1_body (by simp)
 
-/- [constants::P2] -/
+/- [constants::P2]
+   Source: 'src/constants.rs', lines 33:0-33:24 -/
 def p2_body : Result (U32 × U32) := Result.ret (0#u32, 1#u32)
 def p2_c : (U32 × U32) := eval_global p2_body (by simp)
 
-/- [constants::P3] -/
+/- [constants::P3]
+   Source: 'src/constants.rs', lines 34:0-34:28 -/
 def p3_body : Result (Pair U32 U32) := Result.ret { x := 0#u32, y := 1#u32 }
 def p3_c : Pair U32 U32 := eval_global p3_body (by simp)
 
-/- [constants::Wrap] -/
+/- [constants::Wrap]
+   Source: 'src/constants.rs', lines 49:0-49:18 -/
 structure Wrap (T : Type) where
   value : T
 
-/- [constants::Wrap::{0}::new]: forward function -/
+/- [constants::{constants::Wrap<T>}::new]: forward function
+   Source: 'src/constants.rs', lines 54:4-54:41 -/
 def Wrap.new (T : Type) (value : T) : Result (Wrap T) :=
   Result.ret { value := value }
 
-/- [constants::Y] -/
+/- [constants::Y]
+   Source: 'src/constants.rs', lines 41:0-41:22 -/
 def y_body : Result (Wrap I32) := Wrap.new I32 2#i32
 def y_c : Wrap I32 := eval_global y_body (by simp)
 
-/- [constants::unwrap_y]: forward function -/
+/- [constants::unwrap_y]: forward function
+   Source: 'src/constants.rs', lines 43:0-43:30 -/
 def unwrap_y : Result I32 :=
   Result.ret y_c.value
 
-/- [constants::YVAL] -/
+/- [constants::YVAL]
+   Source: 'src/constants.rs', lines 47:0-47:19 -/
 def yval_body : Result I32 := unwrap_y
 def yval_c : I32 := eval_global yval_body (by simp)
 
-/- [constants::get_z1::Z1] -/
+/- [constants::get_z1::Z1]
+   Source: 'src/constants.rs', lines 62:4-62:17 -/
 def get_z1_z1_body : Result I32 := Result.ret 3#i32
 def get_z1_z1_c : I32 := eval_global get_z1_z1_body (by simp)
 
-/- [constants::get_z1]: forward function -/
+/- [constants::get_z1]: forward function
+   Source: 'src/constants.rs', lines 61:0-61:28 -/
 def get_z1 : Result I32 :=
   Result.ret get_z1_z1_c
 
-/- [constants::add]: forward function -/
+/- [constants::add]: forward function
+   Source: 'src/constants.rs', lines 66:0-66:39 -/
 def add (a : I32) (b : I32) : Result I32 :=
   a + b
 
-/- [constants::Q1] -/
+/- [constants::Q1]
+   Source: 'src/constants.rs', lines 74:0-74:17 -/
 def q1_body : Result I32 := Result.ret 5#i32
 def q1_c : I32 := eval_global q1_body (by simp)
 
-/- [constants::Q2] -/
+/- [constants::Q2]
+   Source: 'src/constants.rs', lines 75:0-75:17 -/
 def q2_body : Result I32 := Result.ret q1_c
 def q2_c : I32 := eval_global q2_body (by simp)
 
-/- [constants::Q3] -/
+/- [constants::Q3]
+   Source: 'src/constants.rs', lines 76:0-76:17 -/
 def q3_body : Result I32 := add q2_c 3#i32
 def q3_c : I32 := eval_global q3_body (by simp)
 
-/- [constants::get_z2]: forward function -/
+/- [constants::get_z2]: forward function
+   Source: 'src/constants.rs', lines 70:0-70:28 -/
 def get_z2 : Result I32 :=
   do
     let i ← get_z1
     let i0 ← add i q3_c
     add q1_c i0
 
-/- [constants::S1] -/
+/- [constants::S1]
+   Source: 'src/constants.rs', lines 80:0-80:18 -/
 def s1_body : Result U32 := Result.ret 6#u32
 def s1_c : U32 := eval_global s1_body (by simp)
 
-/- [constants::S2] -/
+/- [constants::S2]
+   Source: 'src/constants.rs', lines 81:0-81:18 -/
 def s2_body : Result U32 := incr s1_c
 def s2_c : U32 := eval_global s2_body (by simp)
 
-/- [constants::S3] -/
+/- [constants::S3]
+   Source: 'src/constants.rs', lines 82:0-82:29 -/
 def s3_body : Result (Pair U32 U32) := Result.ret p3_c
 def s3_c : Pair U32 U32 := eval_global s3_body (by simp)
 
-/- [constants::S4] -/
+/- [constants::S4]
+   Source: 'src/constants.rs', lines 83:0-83:29 -/
 def s4_body : Result (Pair U32 U32) := mk_pair1 7#u32 8#u32
 def s4_c : Pair U32 U32 := eval_global s4_body (by simp)
 
diff --git a/tests/lean/External/Funs.lean b/tests/lean/External/Funs.lean
index 55fb07be..e5655c7e 100644
--- a/tests/lean/External/Funs.lean
+++ b/tests/lean/External/Funs.lean
@@ -7,7 +7,8 @@ open Primitives
 
 namespace external
 
-/- [external::swap]: forward function -/
+/- [external::swap]: forward function
+   Source: 'src/external.rs', lines 6:0-6:46 -/
 def swap (T : Type) (x : T) (y : T) (st : State) : Result (State × Unit) :=
   do
     let (st0, _) ← core.mem.swap T x y st
@@ -15,7 +16,8 @@ def swap (T : Type) (x : T) (y : T) (st : State) : Result (State × Unit) :=
     let (st2, _) ← core.mem.swap_back1 T x y st st1
     Result.ret (st2, ())
 
-/- [external::swap]: backward function 0 -/
+/- [external::swap]: backward function 0
+   Source: 'src/external.rs', lines 6:0-6:46 -/
 def swap_back
   (T : Type) (x : T) (y : T) (st : State) (st0 : State) :
   Result (State × (T × T))
@@ -26,14 +28,16 @@ def swap_back
     let (_, y0) ← core.mem.swap_back1 T x y st st2
     Result.ret (st0, (x0, y0))
 
-/- [external::test_new_non_zero_u32]: forward function -/
+/- [external::test_new_non_zero_u32]: forward function
+   Source: 'src/external.rs', lines 11:0-11:60 -/
 def test_new_non_zero_u32
   (x : U32) (st : State) : Result (State × core.num.nonzero.NonZeroU32) :=
   do
     let (st0, o) ← core.num.nonzero.NonZeroU32.new x st
     core.option.Option.unwrap core.num.nonzero.NonZeroU32 o st0
 
-/- [external::test_vec]: forward function -/
+/- [external::test_vec]: forward function
+   Source: 'src/external.rs', lines 17:0-17:17 -/
 def test_vec : Result Unit :=
   do
     let v := alloc.vec.Vec.new U32
@@ -43,7 +47,8 @@ def test_vec : Result Unit :=
 /- Unit test for [external::test_vec] -/
 #assert (test_vec == .ret ())
 
-/- [external::custom_swap]: forward function -/
+/- [external::custom_swap]: forward function
+   Source: 'src/external.rs', lines 24:0-24:66 -/
 def custom_swap
   (T : Type) (x : T) (y : T) (st : State) : Result (State × T) :=
   do
@@ -52,7 +57,8 @@ def custom_swap
     let (st2, _) ← core.mem.swap_back1 T x y st st1
     Result.ret (st2, x0)
 
-/- [external::custom_swap]: backward function 0 -/
+/- [external::custom_swap]: backward function 0
+   Source: 'src/external.rs', lines 24:0-24:66 -/
 def custom_swap_back
   (T : Type) (x : T) (y : T) (st : State) (ret0 : T) (st0 : State) :
   Result (State × (T × T))
@@ -63,21 +69,24 @@ def custom_swap_back
     let (_, y0) ← core.mem.swap_back1 T x y st st2
     Result.ret (st0, (ret0, y0))
 
-/- [external::test_custom_swap]: forward function -/
+/- [external::test_custom_swap]: forward function
+   Source: 'src/external.rs', lines 29:0-29:59 -/
 def test_custom_swap
   (x : U32) (y : U32) (st : State) : Result (State × Unit) :=
   do
     let (st0, _) ← custom_swap U32 x y st
     Result.ret (st0, ())
 
-/- [external::test_custom_swap]: backward function 0 -/
+/- [external::test_custom_swap]: backward function 0
+   Source: 'src/external.rs', lines 29:0-29:59 -/
 def test_custom_swap_back
   (x : U32) (y : U32) (st : State) (st0 : State) :
   Result (State × (U32 × U32))
   :=
   custom_swap_back U32 x y st 1#u32 st0
 
-/- [external::test_swap_non_zero]: forward function -/
+/- [external::test_swap_non_zero]: forward function
+   Source: 'src/external.rs', lines 35:0-35:44 -/
 def test_swap_non_zero (x : U32) (st : State) : Result (State × U32) :=
   do
     let (st0, _) ← swap U32 x 0#u32 st
diff --git a/tests/lean/External/FunsExternal_Template.lean b/tests/lean/External/FunsExternal_Template.lean
index c8bc397f..55cd6bb5 100644
--- a/tests/lean/External/FunsExternal_Template.lean
+++ b/tests/lean/External/FunsExternal_Template.lean
@@ -6,22 +6,27 @@ import External.Types
 open Primitives
 open external
 
-/- [core::mem::swap]: forward function -/
+/- [core::mem::swap]: forward function
+   Source: '/rustc/d59363ad0b6391b7fc5bbb02c9ccf9300eef3753/library/core/src/mem/mod.rs', lines 726:0-726:42 -/
 axiom core.mem.swap (T : Type) : T → T → State → Result (State × Unit)
 
-/- [core::mem::swap]: backward function 0 -/
+/- [core::mem::swap]: backward function 0
+   Source: '/rustc/d59363ad0b6391b7fc5bbb02c9ccf9300eef3753/library/core/src/mem/mod.rs', lines 726:0-726:42 -/
 axiom core.mem.swap_back0
   (T : Type) : T → T → State → State → Result (State × T)
 
-/- [core::mem::swap]: backward function 1 -/
+/- [core::mem::swap]: backward function 1
+   Source: '/rustc/d59363ad0b6391b7fc5bbb02c9ccf9300eef3753/library/core/src/mem/mod.rs', lines 726:0-726:42 -/
 axiom core.mem.swap_back1
   (T : Type) : T → T → State → State → Result (State × T)
 
-/- [core::num::nonzero::NonZeroU32::{14}::new]: forward function -/
+/- [core::num::nonzero::{core::num::nonzero::NonZeroU32#14}::new]: forward function
+   Source: '/rustc/d59363ad0b6391b7fc5bbb02c9ccf9300eef3753/library/core/src/num/nonzero.rs', lines 79:16-79:57 -/
 axiom core.num.nonzero.NonZeroU32.new
   : U32 → State → Result (State × (Option core.num.nonzero.NonZeroU32))
 
-/- [core::option::Option::{0}::unwrap]: forward function -/
+/- [core::option::{core::option::Option<T>}::unwrap]: forward function
+   Source: '/rustc/d59363ad0b6391b7fc5bbb02c9ccf9300eef3753/library/core/src/option.rs', lines 932:4-932:34 -/
 axiom core.option.Option.unwrap
   (T : Type) : Option T → State → Result (State × T)
 
diff --git a/tests/lean/External/Types.lean b/tests/lean/External/Types.lean
index 71d70eed..40f20cda 100644
--- a/tests/lean/External/Types.lean
+++ b/tests/lean/External/Types.lean
@@ -5,7 +5,8 @@ open Primitives
 
 namespace external
 
-/- [core::num::nonzero::NonZeroU32] -/
+/- [core::num::nonzero::NonZeroU32]
+   Source: '/rustc/d59363ad0b6391b7fc5bbb02c9ccf9300eef3753/library/core/src/num/nonzero.rs', lines 50:12-50:33 -/
 axiom core.num.nonzero.NonZeroU32 : Type
 
 /- The state type used in the state-error monad -/
diff --git a/tests/lean/Hashmap/Funs.lean b/tests/lean/Hashmap/Funs.lean
index 8464c432..95c501f6 100644
--- a/tests/lean/Hashmap/Funs.lean
+++ b/tests/lean/Hashmap/Funs.lean
@@ -6,11 +6,13 @@ open Primitives
 
 namespace hashmap
 
-/- [hashmap::hash_key]: forward function -/
+/- [hashmap::hash_key]: forward function
+   Source: 'src/hashmap.rs', lines 27:0-27:32 -/
 def hash_key (k : Usize) : Result Usize :=
   Result.ret k
 
-/- [hashmap::HashMap::{0}::allocate_slots]: loop 0: forward function -/
+/- [hashmap::{hashmap::HashMap<T>}::allocate_slots]: loop 0: forward function
+   Source: 'src/hashmap.rs', lines 50:4-56:5 -/
 divergent def HashMap.allocate_slots_loop
   (T : Type) (slots : alloc.vec.Vec (List T)) (n : Usize) :
   Result (alloc.vec.Vec (List T))
@@ -23,14 +25,16 @@ divergent def HashMap.allocate_slots_loop
       HashMap.allocate_slots_loop T slots0 n0
   else Result.ret slots
 
-/- [hashmap::HashMap::{0}::allocate_slots]: forward function -/
+/- [hashmap::{hashmap::HashMap<T>}::allocate_slots]: forward function
+   Source: 'src/hashmap.rs', lines 50:4-50:76 -/
 def HashMap.allocate_slots
   (T : Type) (slots : alloc.vec.Vec (List T)) (n : Usize) :
   Result (alloc.vec.Vec (List T))
   :=
   HashMap.allocate_slots_loop T slots n
 
-/- [hashmap::HashMap::{0}::new_with_capacity]: forward function -/
+/- [hashmap::{hashmap::HashMap<T>}::new_with_capacity]: forward function
+   Source: 'src/hashmap.rs', lines 59:4-63:13 -/
 def HashMap.new_with_capacity
   (T : Type) (capacity : Usize) (max_load_dividend : Usize)
   (max_load_divisor : Usize) :
@@ -49,12 +53,14 @@ def HashMap.new_with_capacity
         slots := slots
       }
 
-/- [hashmap::HashMap::{0}::new]: forward function -/
+/- [hashmap::{hashmap::HashMap<T>}::new]: forward function
+   Source: 'src/hashmap.rs', lines 75:4-75:24 -/
 def HashMap.new (T : Type) : Result (HashMap T) :=
   HashMap.new_with_capacity T 32#usize 4#usize 5#usize
 
-/- [hashmap::HashMap::{0}::clear]: loop 0: merged forward/backward function
-   (there is a single backward function, and the forward function returns ()) -/
+/- [hashmap::{hashmap::HashMap<T>}::clear]: loop 0: merged forward/backward function
+   (there is a single backward function, and the forward function returns ())
+   Source: 'src/hashmap.rs', lines 80:4-88:5 -/
 divergent def HashMap.clear_loop
   (T : Type) (slots : alloc.vec.Vec (List T)) (i : Usize) :
   Result (alloc.vec.Vec (List T))
@@ -66,23 +72,26 @@ divergent def HashMap.clear_loop
       let i1 ← i + 1#usize
       let slots0 ←
         alloc.vec.Vec.index_mut_back (List T) Usize
-          (core.slice.index.usize.coresliceindexSliceIndexInst (List T)) slots
-          i List.Nil
+          (core.slice.index.SliceIndexUsizeSliceTInst (List T)) slots i
+          List.Nil
       HashMap.clear_loop T slots0 i1
   else Result.ret slots
 
-/- [hashmap::HashMap::{0}::clear]: merged forward/backward function
-   (there is a single backward function, and the forward function returns ()) -/
+/- [hashmap::{hashmap::HashMap<T>}::clear]: merged forward/backward function
+   (there is a single backward function, and the forward function returns ())
+   Source: 'src/hashmap.rs', lines 80:4-80:27 -/
 def HashMap.clear (T : Type) (self : HashMap T) : Result (HashMap T) :=
   do
     let v ← HashMap.clear_loop T self.slots 0#usize
     Result.ret { self with num_entries := 0#usize, slots := v }
 
-/- [hashmap::HashMap::{0}::len]: forward function -/
+/- [hashmap::{hashmap::HashMap<T>}::len]: forward function
+   Source: 'src/hashmap.rs', lines 90:4-90:30 -/
 def HashMap.len (T : Type) (self : HashMap T) : Result Usize :=
   Result.ret self.num_entries
 
-/- [hashmap::HashMap::{0}::insert_in_list]: loop 0: forward function -/
+/- [hashmap::{hashmap::HashMap<T>}::insert_in_list]: loop 0: forward function
+   Source: 'src/hashmap.rs', lines 97:4-114:5 -/
 divergent def HashMap.insert_in_list_loop
   (T : Type) (key : Usize) (value : T) (ls : List T) : Result Bool :=
   match ls with
@@ -92,12 +101,14 @@ divergent def HashMap.insert_in_list_loop
     else HashMap.insert_in_list_loop T key value tl
   | List.Nil => Result.ret true
 
-/- [hashmap::HashMap::{0}::insert_in_list]: forward function -/
+/- [hashmap::{hashmap::HashMap<T>}::insert_in_list]: forward function
+   Source: 'src/hashmap.rs', lines 97:4-97:71 -/
 def HashMap.insert_in_list
   (T : Type) (key : Usize) (value : T) (ls : List T) : Result Bool :=
   HashMap.insert_in_list_loop T key value ls
 
-/- [hashmap::HashMap::{0}::insert_in_list]: loop 0: backward function 0 -/
+/- [hashmap::{hashmap::HashMap<T>}::insert_in_list]: loop 0: backward function 0
+   Source: 'src/hashmap.rs', lines 97:4-114:5 -/
 divergent def HashMap.insert_in_list_loop_back
   (T : Type) (key : Usize) (value : T) (ls : List T) : Result (List T) :=
   match ls with
@@ -111,13 +122,15 @@ divergent def HashMap.insert_in_list_loop_back
   | List.Nil => let l := List.Nil
                 Result.ret (List.Cons key value l)
 
-/- [hashmap::HashMap::{0}::insert_in_list]: backward function 0 -/
+/- [hashmap::{hashmap::HashMap<T>}::insert_in_list]: backward function 0
+   Source: 'src/hashmap.rs', lines 97:4-97:71 -/
 def HashMap.insert_in_list_back
   (T : Type) (key : Usize) (value : T) (ls : List T) : Result (List T) :=
   HashMap.insert_in_list_loop_back T key value ls
 
-/- [hashmap::HashMap::{0}::insert_no_resize]: merged forward/backward function
-   (there is a single backward function, and the forward function returns ()) -/
+/- [hashmap::{hashmap::HashMap<T>}::insert_no_resize]: merged forward/backward function
+   (there is a single backward function, and the forward function returns ())
+   Source: 'src/hashmap.rs', lines 117:4-117:54 -/
 def HashMap.insert_no_resize
   (T : Type) (self : HashMap T) (key : Usize) (value : T) :
   Result (HashMap T)
@@ -128,8 +141,8 @@ def HashMap.insert_no_resize
     let hash_mod ← hash % i
     let l ←
       alloc.vec.Vec.index_mut (List T) Usize
-        (core.slice.index.usize.coresliceindexSliceIndexInst (List T))
-        self.slots hash_mod
+        (core.slice.index.SliceIndexUsizeSliceTInst (List T)) self.slots
+        hash_mod
     let inserted ← HashMap.insert_in_list T key value l
     if inserted
     then
@@ -138,20 +151,21 @@ def HashMap.insert_no_resize
         let l0 ← HashMap.insert_in_list_back T key value l
         let v ←
           alloc.vec.Vec.index_mut_back (List T) Usize
-            (core.slice.index.usize.coresliceindexSliceIndexInst (List T))
-            self.slots hash_mod l0
+            (core.slice.index.SliceIndexUsizeSliceTInst (List T)) self.slots
+            hash_mod l0
         Result.ret { self with num_entries := i0, slots := v }
     else
       do
         let l0 ← HashMap.insert_in_list_back T key value l
         let v ←
           alloc.vec.Vec.index_mut_back (List T) Usize
-            (core.slice.index.usize.coresliceindexSliceIndexInst (List T))
-            self.slots hash_mod l0
+            (core.slice.index.SliceIndexUsizeSliceTInst (List T)) self.slots
+            hash_mod l0
         Result.ret { self with slots := v }
 
-/- [hashmap::HashMap::{0}::move_elements_from_list]: loop 0: merged forward/backward function
-   (there is a single backward function, and the forward function returns ()) -/
+/- [hashmap::{hashmap::HashMap<T>}::move_elements_from_list]: loop 0: merged forward/backward function
+   (there is a single backward function, and the forward function returns ())
+   Source: 'src/hashmap.rs', lines 183:4-196:5 -/
 divergent def HashMap.move_elements_from_list_loop
   (T : Type) (ntable : HashMap T) (ls : List T) : Result (HashMap T) :=
   match ls with
@@ -161,14 +175,16 @@ divergent def HashMap.move_elements_from_list_loop
       HashMap.move_elements_from_list_loop T ntable0 tl
   | List.Nil => Result.ret ntable
 
-/- [hashmap::HashMap::{0}::move_elements_from_list]: merged forward/backward function
-   (there is a single backward function, and the forward function returns ()) -/
+/- [hashmap::{hashmap::HashMap<T>}::move_elements_from_list]: merged forward/backward function
+   (there is a single backward function, and the forward function returns ())
+   Source: 'src/hashmap.rs', lines 183:4-183:72 -/
 def HashMap.move_elements_from_list
   (T : Type) (ntable : HashMap T) (ls : List T) : Result (HashMap T) :=
   HashMap.move_elements_from_list_loop T ntable ls
 
-/- [hashmap::HashMap::{0}::move_elements]: loop 0: merged forward/backward function
-   (there is a single backward function, and the forward function returns ()) -/
+/- [hashmap::{hashmap::HashMap<T>}::move_elements]: loop 0: merged forward/backward function
+   (there is a single backward function, and the forward function returns ())
+   Source: 'src/hashmap.rs', lines 171:4-180:5 -/
 divergent def HashMap.move_elements_loop
   (T : Type) (ntable : HashMap T) (slots : alloc.vec.Vec (List T)) (i : Usize)
   :
@@ -180,21 +196,20 @@ divergent def HashMap.move_elements_loop
     do
       let l ←
         alloc.vec.Vec.index_mut (List T) Usize
-          (core.slice.index.usize.coresliceindexSliceIndexInst (List T)) slots
-          i
+          (core.slice.index.SliceIndexUsizeSliceTInst (List T)) slots i
       let ls := core.mem.replace (List T) l List.Nil
       let ntable0 ← HashMap.move_elements_from_list T ntable ls
       let i1 ← i + 1#usize
       let l0 := core.mem.replace_back (List T) l List.Nil
       let slots0 ←
         alloc.vec.Vec.index_mut_back (List T) Usize
-          (core.slice.index.usize.coresliceindexSliceIndexInst (List T)) slots
-          i l0
+          (core.slice.index.SliceIndexUsizeSliceTInst (List T)) slots i l0
       HashMap.move_elements_loop T ntable0 slots0 i1
   else Result.ret (ntable, slots)
 
-/- [hashmap::HashMap::{0}::move_elements]: merged forward/backward function
-   (there is a single backward function, and the forward function returns ()) -/
+/- [hashmap::{hashmap::HashMap<T>}::move_elements]: merged forward/backward function
+   (there is a single backward function, and the forward function returns ())
+   Source: 'src/hashmap.rs', lines 171:4-171:95 -/
 def HashMap.move_elements
   (T : Type) (ntable : HashMap T) (slots : alloc.vec.Vec (List T)) (i : Usize)
   :
@@ -202,8 +217,9 @@ def HashMap.move_elements
   :=
   HashMap.move_elements_loop T ntable slots i
 
-/- [hashmap::HashMap::{0}::try_resize]: merged forward/backward function
-   (there is a single backward function, and the forward function returns ()) -/
+/- [hashmap::{hashmap::HashMap<T>}::try_resize]: merged forward/backward function
+   (there is a single backward function, and the forward function returns ())
+   Source: 'src/hashmap.rs', lines 140:4-140:28 -/
 def HashMap.try_resize (T : Type) (self : HashMap T) : Result (HashMap T) :=
   do
     let max_usize ← Scalar.cast .Usize core_u32_max
@@ -225,8 +241,9 @@ def HashMap.try_resize (T : Type) (self : HashMap T) : Result (HashMap T) :=
           }
     else Result.ret { self with max_load_factor := (i, i0) }
 
-/- [hashmap::HashMap::{0}::insert]: merged forward/backward function
-   (there is a single backward function, and the forward function returns ()) -/
+/- [hashmap::{hashmap::HashMap<T>}::insert]: merged forward/backward function
+   (there is a single backward function, and the forward function returns ())
+   Source: 'src/hashmap.rs', lines 129:4-129:48 -/
 def HashMap.insert
   (T : Type) (self : HashMap T) (key : Usize) (value : T) :
   Result (HashMap T)
@@ -238,7 +255,8 @@ def HashMap.insert
     then HashMap.try_resize T self0
     else Result.ret self0
 
-/- [hashmap::HashMap::{0}::contains_key_in_list]: loop 0: forward function -/
+/- [hashmap::{hashmap::HashMap<T>}::contains_key_in_list]: loop 0: forward function
+   Source: 'src/hashmap.rs', lines 206:4-219:5 -/
 divergent def HashMap.contains_key_in_list_loop
   (T : Type) (key : Usize) (ls : List T) : Result Bool :=
   match ls with
@@ -248,12 +266,14 @@ divergent def HashMap.contains_key_in_list_loop
     else HashMap.contains_key_in_list_loop T key tl
   | List.Nil => Result.ret false
 
-/- [hashmap::HashMap::{0}::contains_key_in_list]: forward function -/
+/- [hashmap::{hashmap::HashMap<T>}::contains_key_in_list]: forward function
+   Source: 'src/hashmap.rs', lines 206:4-206:68 -/
 def HashMap.contains_key_in_list
   (T : Type) (key : Usize) (ls : List T) : Result Bool :=
   HashMap.contains_key_in_list_loop T key ls
 
-/- [hashmap::HashMap::{0}::contains_key]: forward function -/
+/- [hashmap::{hashmap::HashMap<T>}::contains_key]: forward function
+   Source: 'src/hashmap.rs', lines 199:4-199:49 -/
 def HashMap.contains_key
   (T : Type) (self : HashMap T) (key : Usize) : Result Bool :=
   do
@@ -262,11 +282,12 @@ def HashMap.contains_key
     let hash_mod ← hash % i
     let l ←
       alloc.vec.Vec.index (List T) Usize
-        (core.slice.index.usize.coresliceindexSliceIndexInst (List T))
-        self.slots hash_mod
+        (core.slice.index.SliceIndexUsizeSliceTInst (List T)) self.slots
+        hash_mod
     HashMap.contains_key_in_list T key l
 
-/- [hashmap::HashMap::{0}::get_in_list]: loop 0: forward function -/
+/- [hashmap::{hashmap::HashMap<T>}::get_in_list]: loop 0: forward function
+   Source: 'src/hashmap.rs', lines 224:4-237:5 -/
 divergent def HashMap.get_in_list_loop
   (T : Type) (key : Usize) (ls : List T) : Result T :=
   match ls with
@@ -276,11 +297,13 @@ divergent def HashMap.get_in_list_loop
     else HashMap.get_in_list_loop T key tl
   | List.Nil => Result.fail Error.panic
 
-/- [hashmap::HashMap::{0}::get_in_list]: forward function -/
+/- [hashmap::{hashmap::HashMap<T>}::get_in_list]: forward function
+   Source: 'src/hashmap.rs', lines 224:4-224:70 -/
 def HashMap.get_in_list (T : Type) (key : Usize) (ls : List T) : Result T :=
   HashMap.get_in_list_loop T key ls
 
-/- [hashmap::HashMap::{0}::get]: forward function -/
+/- [hashmap::{hashmap::HashMap<T>}::get]: forward function
+   Source: 'src/hashmap.rs', lines 239:4-239:55 -/
 def HashMap.get (T : Type) (self : HashMap T) (key : Usize) : Result T :=
   do
     let hash ← hash_key key
@@ -288,11 +311,12 @@ def HashMap.get (T : Type) (self : HashMap T) (key : Usize) : Result T :=
     let hash_mod ← hash % i
     let l ←
       alloc.vec.Vec.index (List T) Usize
-        (core.slice.index.usize.coresliceindexSliceIndexInst (List T))
-        self.slots hash_mod
+        (core.slice.index.SliceIndexUsizeSliceTInst (List T)) self.slots
+        hash_mod
     HashMap.get_in_list T key l
 
-/- [hashmap::HashMap::{0}::get_mut_in_list]: loop 0: forward function -/
+/- [hashmap::{hashmap::HashMap<T>}::get_mut_in_list]: loop 0: forward function
+   Source: 'src/hashmap.rs', lines 245:4-254:5 -/
 divergent def HashMap.get_mut_in_list_loop
   (T : Type) (ls : List T) (key : Usize) : Result T :=
   match ls with
@@ -302,12 +326,14 @@ divergent def HashMap.get_mut_in_list_loop
     else HashMap.get_mut_in_list_loop T tl key
   | List.Nil => Result.fail Error.panic
 
-/- [hashmap::HashMap::{0}::get_mut_in_list]: forward function -/
+/- [hashmap::{hashmap::HashMap<T>}::get_mut_in_list]: forward function
+   Source: 'src/hashmap.rs', lines 245:4-245:86 -/
 def HashMap.get_mut_in_list
   (T : Type) (ls : List T) (key : Usize) : Result T :=
   HashMap.get_mut_in_list_loop T ls key
 
-/- [hashmap::HashMap::{0}::get_mut_in_list]: loop 0: backward function 0 -/
+/- [hashmap::{hashmap::HashMap<T>}::get_mut_in_list]: loop 0: backward function 0
+   Source: 'src/hashmap.rs', lines 245:4-254:5 -/
 divergent def HashMap.get_mut_in_list_loop_back
   (T : Type) (ls : List T) (key : Usize) (ret0 : T) : Result (List T) :=
   match ls with
@@ -320,12 +346,14 @@ divergent def HashMap.get_mut_in_list_loop_back
         Result.ret (List.Cons ckey cvalue tl0)
   | List.Nil => Result.fail Error.panic
 
-/- [hashmap::HashMap::{0}::get_mut_in_list]: backward function 0 -/
+/- [hashmap::{hashmap::HashMap<T>}::get_mut_in_list]: backward function 0
+   Source: 'src/hashmap.rs', lines 245:4-245:86 -/
 def HashMap.get_mut_in_list_back
   (T : Type) (ls : List T) (key : Usize) (ret0 : T) : Result (List T) :=
   HashMap.get_mut_in_list_loop_back T ls key ret0
 
-/- [hashmap::HashMap::{0}::get_mut]: forward function -/
+/- [hashmap::{hashmap::HashMap<T>}::get_mut]: forward function
+   Source: 'src/hashmap.rs', lines 257:4-257:67 -/
 def HashMap.get_mut (T : Type) (self : HashMap T) (key : Usize) : Result T :=
   do
     let hash ← hash_key key
@@ -333,11 +361,12 @@ def HashMap.get_mut (T : Type) (self : HashMap T) (key : Usize) : Result T :=
     let hash_mod ← hash % i
     let l ←
       alloc.vec.Vec.index_mut (List T) Usize
-        (core.slice.index.usize.coresliceindexSliceIndexInst (List T))
-        self.slots hash_mod
+        (core.slice.index.SliceIndexUsizeSliceTInst (List T)) self.slots
+        hash_mod
     HashMap.get_mut_in_list T l key
 
-/- [hashmap::HashMap::{0}::get_mut]: backward function 0 -/
+/- [hashmap::{hashmap::HashMap<T>}::get_mut]: backward function 0
+   Source: 'src/hashmap.rs', lines 257:4-257:67 -/
 def HashMap.get_mut_back
   (T : Type) (self : HashMap T) (key : Usize) (ret0 : T) :
   Result (HashMap T)
@@ -348,16 +377,17 @@ def HashMap.get_mut_back
     let hash_mod ← hash % i
     let l ←
       alloc.vec.Vec.index_mut (List T) Usize
-        (core.slice.index.usize.coresliceindexSliceIndexInst (List T))
-        self.slots hash_mod
+        (core.slice.index.SliceIndexUsizeSliceTInst (List T)) self.slots
+        hash_mod
     let l0 ← HashMap.get_mut_in_list_back T l key ret0
     let v ←
       alloc.vec.Vec.index_mut_back (List T) Usize
-        (core.slice.index.usize.coresliceindexSliceIndexInst (List T))
-        self.slots hash_mod l0
+        (core.slice.index.SliceIndexUsizeSliceTInst (List T)) self.slots
+        hash_mod l0
     Result.ret { self with slots := v }
 
-/- [hashmap::HashMap::{0}::remove_from_list]: loop 0: forward function -/
+/- [hashmap::{hashmap::HashMap<T>}::remove_from_list]: loop 0: forward function
+   Source: 'src/hashmap.rs', lines 265:4-291:5 -/
 divergent def HashMap.remove_from_list_loop
   (T : Type) (key : Usize) (ls : List T) : Result (Option T) :=
   match ls with
@@ -371,12 +401,14 @@ divergent def HashMap.remove_from_list_loop
     else HashMap.remove_from_list_loop T key tl
   | List.Nil => Result.ret none
 
-/- [hashmap::HashMap::{0}::remove_from_list]: forward function -/
+/- [hashmap::{hashmap::HashMap<T>}::remove_from_list]: forward function
+   Source: 'src/hashmap.rs', lines 265:4-265:69 -/
 def HashMap.remove_from_list
   (T : Type) (key : Usize) (ls : List T) : Result (Option T) :=
   HashMap.remove_from_list_loop T key ls
 
-/- [hashmap::HashMap::{0}::remove_from_list]: loop 0: backward function 1 -/
+/- [hashmap::{hashmap::HashMap<T>}::remove_from_list]: loop 0: backward function 1
+   Source: 'src/hashmap.rs', lines 265:4-291:5 -/
 divergent def HashMap.remove_from_list_loop_back
   (T : Type) (key : Usize) (ls : List T) : Result (List T) :=
   match ls with
@@ -393,12 +425,14 @@ divergent def HashMap.remove_from_list_loop_back
         Result.ret (List.Cons ckey t tl0)
   | List.Nil => Result.ret List.Nil
 
-/- [hashmap::HashMap::{0}::remove_from_list]: backward function 1 -/
+/- [hashmap::{hashmap::HashMap<T>}::remove_from_list]: backward function 1
+   Source: 'src/hashmap.rs', lines 265:4-265:69 -/
 def HashMap.remove_from_list_back
   (T : Type) (key : Usize) (ls : List T) : Result (List T) :=
   HashMap.remove_from_list_loop_back T key ls
 
-/- [hashmap::HashMap::{0}::remove]: forward function -/
+/- [hashmap::{hashmap::HashMap<T>}::remove]: forward function
+   Source: 'src/hashmap.rs', lines 294:4-294:52 -/
 def HashMap.remove
   (T : Type) (self : HashMap T) (key : Usize) : Result (Option T) :=
   do
@@ -407,8 +441,8 @@ def HashMap.remove
     let hash_mod ← hash % i
     let l ←
       alloc.vec.Vec.index_mut (List T) Usize
-        (core.slice.index.usize.coresliceindexSliceIndexInst (List T))
-        self.slots hash_mod
+        (core.slice.index.SliceIndexUsizeSliceTInst (List T)) self.slots
+        hash_mod
     let x ← HashMap.remove_from_list T key l
     match x with
     | none => Result.ret none
@@ -416,7 +450,8 @@ def HashMap.remove
                    let _ ← self.num_entries - 1#usize
                    Result.ret (some x0)
 
-/- [hashmap::HashMap::{0}::remove]: backward function 0 -/
+/- [hashmap::{hashmap::HashMap<T>}::remove]: backward function 0
+   Source: 'src/hashmap.rs', lines 294:4-294:52 -/
 def HashMap.remove_back
   (T : Type) (self : HashMap T) (key : Usize) : Result (HashMap T) :=
   do
@@ -425,8 +460,8 @@ def HashMap.remove_back
     let hash_mod ← hash % i
     let l ←
       alloc.vec.Vec.index_mut (List T) Usize
-        (core.slice.index.usize.coresliceindexSliceIndexInst (List T))
-        self.slots hash_mod
+        (core.slice.index.SliceIndexUsizeSliceTInst (List T)) self.slots
+        hash_mod
     let x ← HashMap.remove_from_list T key l
     match x with
     | none =>
@@ -434,8 +469,8 @@ def HashMap.remove_back
         let l0 ← HashMap.remove_from_list_back T key l
         let v ←
           alloc.vec.Vec.index_mut_back (List T) Usize
-            (core.slice.index.usize.coresliceindexSliceIndexInst (List T))
-            self.slots hash_mod l0
+            (core.slice.index.SliceIndexUsizeSliceTInst (List T)) self.slots
+            hash_mod l0
         Result.ret { self with slots := v }
     | some x0 =>
       do
@@ -443,11 +478,12 @@ def HashMap.remove_back
         let l0 ← HashMap.remove_from_list_back T key l
         let v ←
           alloc.vec.Vec.index_mut_back (List T) Usize
-            (core.slice.index.usize.coresliceindexSliceIndexInst (List T))
-            self.slots hash_mod l0
+            (core.slice.index.SliceIndexUsizeSliceTInst (List T)) self.slots
+            hash_mod l0
         Result.ret { self with num_entries := i0, slots := v }
 
-/- [hashmap::test1]: forward function -/
+/- [hashmap::test1]: forward function
+   Source: 'src/hashmap.rs', lines 315:0-315:10 -/
 def test1 : Result Unit :=
   do
     let hm ← HashMap.new U64
diff --git a/tests/lean/Hashmap/Types.lean b/tests/lean/Hashmap/Types.lean
index e007bce0..fa454123 100644
--- a/tests/lean/Hashmap/Types.lean
+++ b/tests/lean/Hashmap/Types.lean
@@ -5,12 +5,14 @@ open Primitives
 
 namespace hashmap
 
-/- [hashmap::List] -/
+/- [hashmap::List]
+   Source: 'src/hashmap.rs', lines 19:0-19:16 -/
 inductive List (T : Type) :=
 | Cons : Usize → T → List T → List T
 | Nil : List T
 
-/- [hashmap::HashMap] -/
+/- [hashmap::HashMap]
+   Source: 'src/hashmap.rs', lines 35:0-35:21 -/
 structure HashMap (T : Type) where
   num_entries : Usize
   max_load_factor : (Usize × Usize)
diff --git a/tests/lean/HashmapMain/Funs.lean b/tests/lean/HashmapMain/Funs.lean
index 74fa8653..abe84bbf 100644
--- a/tests/lean/HashmapMain/Funs.lean
+++ b/tests/lean/HashmapMain/Funs.lean
@@ -7,11 +7,13 @@ open Primitives
 
 namespace hashmap_main
 
-/- [hashmap_main::hashmap::hash_key]: forward function -/
+/- [hashmap_main::hashmap::hash_key]: forward function
+   Source: 'src/hashmap.rs', lines 27:0-27:32 -/
 def hashmap.hash_key (k : Usize) : Result Usize :=
   Result.ret k
 
-/- [hashmap_main::hashmap::HashMap::{0}::allocate_slots]: loop 0: forward function -/
+/- [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::allocate_slots]: loop 0: forward function
+   Source: 'src/hashmap.rs', lines 50:4-56:5 -/
 divergent def hashmap.HashMap.allocate_slots_loop
   (T : Type) (slots : alloc.vec.Vec (hashmap.List T)) (n : Usize) :
   Result (alloc.vec.Vec (hashmap.List T))
@@ -24,14 +26,16 @@ divergent def hashmap.HashMap.allocate_slots_loop
       hashmap.HashMap.allocate_slots_loop T slots0 n0
   else Result.ret slots
 
-/- [hashmap_main::hashmap::HashMap::{0}::allocate_slots]: forward function -/
+/- [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::allocate_slots]: forward function
+   Source: 'src/hashmap.rs', lines 50:4-50:76 -/
 def hashmap.HashMap.allocate_slots
   (T : Type) (slots : alloc.vec.Vec (hashmap.List T)) (n : Usize) :
   Result (alloc.vec.Vec (hashmap.List T))
   :=
   hashmap.HashMap.allocate_slots_loop T slots n
 
-/- [hashmap_main::hashmap::HashMap::{0}::new_with_capacity]: forward function -/
+/- [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::new_with_capacity]: forward function
+   Source: 'src/hashmap.rs', lines 59:4-63:13 -/
 def hashmap.HashMap.new_with_capacity
   (T : Type) (capacity : Usize) (max_load_dividend : Usize)
   (max_load_divisor : Usize) :
@@ -50,12 +54,14 @@ def hashmap.HashMap.new_with_capacity
         slots := slots
       }
 
-/- [hashmap_main::hashmap::HashMap::{0}::new]: forward function -/
+/- [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::new]: forward function
+   Source: 'src/hashmap.rs', lines 75:4-75:24 -/
 def hashmap.HashMap.new (T : Type) : Result (hashmap.HashMap T) :=
   hashmap.HashMap.new_with_capacity T 32#usize 4#usize 5#usize
 
-/- [hashmap_main::hashmap::HashMap::{0}::clear]: loop 0: merged forward/backward function
-   (there is a single backward function, and the forward function returns ()) -/
+/- [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::clear]: loop 0: merged forward/backward function
+   (there is a single backward function, and the forward function returns ())
+   Source: 'src/hashmap.rs', lines 80:4-88:5 -/
 divergent def hashmap.HashMap.clear_loop
   (T : Type) (slots : alloc.vec.Vec (hashmap.List T)) (i : Usize) :
   Result (alloc.vec.Vec (hashmap.List T))
@@ -67,24 +73,27 @@ divergent def hashmap.HashMap.clear_loop
       let i1 ← i + 1#usize
       let slots0 ←
         alloc.vec.Vec.index_mut_back (hashmap.List T) Usize
-          (core.slice.index.usize.coresliceindexSliceIndexInst (hashmap.List
-          T)) slots i hashmap.List.Nil
+          (core.slice.index.SliceIndexUsizeSliceTInst (hashmap.List T)) slots i
+          hashmap.List.Nil
       hashmap.HashMap.clear_loop T slots0 i1
   else Result.ret slots
 
-/- [hashmap_main::hashmap::HashMap::{0}::clear]: merged forward/backward function
-   (there is a single backward function, and the forward function returns ()) -/
+/- [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::clear]: merged forward/backward function
+   (there is a single backward function, and the forward function returns ())
+   Source: 'src/hashmap.rs', lines 80:4-80:27 -/
 def hashmap.HashMap.clear
   (T : Type) (self : hashmap.HashMap T) : Result (hashmap.HashMap T) :=
   do
     let v ← hashmap.HashMap.clear_loop T self.slots 0#usize
     Result.ret { self with num_entries := 0#usize, slots := v }
 
-/- [hashmap_main::hashmap::HashMap::{0}::len]: forward function -/
+/- [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::len]: forward function
+   Source: 'src/hashmap.rs', lines 90:4-90:30 -/
 def hashmap.HashMap.len (T : Type) (self : hashmap.HashMap T) : Result Usize :=
   Result.ret self.num_entries
 
-/- [hashmap_main::hashmap::HashMap::{0}::insert_in_list]: loop 0: forward function -/
+/- [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::insert_in_list]: loop 0: forward function
+   Source: 'src/hashmap.rs', lines 97:4-114:5 -/
 divergent def hashmap.HashMap.insert_in_list_loop
   (T : Type) (key : Usize) (value : T) (ls : hashmap.List T) : Result Bool :=
   match ls with
@@ -94,12 +103,14 @@ divergent def hashmap.HashMap.insert_in_list_loop
     else hashmap.HashMap.insert_in_list_loop T key value tl
   | hashmap.List.Nil => Result.ret true
 
-/- [hashmap_main::hashmap::HashMap::{0}::insert_in_list]: forward function -/
+/- [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::insert_in_list]: forward function
+   Source: 'src/hashmap.rs', lines 97:4-97:71 -/
 def hashmap.HashMap.insert_in_list
   (T : Type) (key : Usize) (value : T) (ls : hashmap.List T) : Result Bool :=
   hashmap.HashMap.insert_in_list_loop T key value ls
 
-/- [hashmap_main::hashmap::HashMap::{0}::insert_in_list]: loop 0: backward function 0 -/
+/- [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::insert_in_list]: loop 0: backward function 0
+   Source: 'src/hashmap.rs', lines 97:4-114:5 -/
 divergent def hashmap.HashMap.insert_in_list_loop_back
   (T : Type) (key : Usize) (value : T) (ls : hashmap.List T) :
   Result (hashmap.List T)
@@ -116,15 +127,17 @@ divergent def hashmap.HashMap.insert_in_list_loop_back
     let l := hashmap.List.Nil
     Result.ret (hashmap.List.Cons key value l)
 
-/- [hashmap_main::hashmap::HashMap::{0}::insert_in_list]: backward function 0 -/
+/- [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::insert_in_list]: backward function 0
+   Source: 'src/hashmap.rs', lines 97:4-97:71 -/
 def hashmap.HashMap.insert_in_list_back
   (T : Type) (key : Usize) (value : T) (ls : hashmap.List T) :
   Result (hashmap.List T)
   :=
   hashmap.HashMap.insert_in_list_loop_back T key value ls
 
-/- [hashmap_main::hashmap::HashMap::{0}::insert_no_resize]: merged forward/backward function
-   (there is a single backward function, and the forward function returns ()) -/
+/- [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::insert_no_resize]: merged forward/backward function
+   (there is a single backward function, and the forward function returns ())
+   Source: 'src/hashmap.rs', lines 117:4-117:54 -/
 def hashmap.HashMap.insert_no_resize
   (T : Type) (self : hashmap.HashMap T) (key : Usize) (value : T) :
   Result (hashmap.HashMap T)
@@ -135,7 +148,7 @@ def hashmap.HashMap.insert_no_resize
     let hash_mod ← hash % i
     let l ←
       alloc.vec.Vec.index_mut (hashmap.List T) Usize
-        (core.slice.index.usize.coresliceindexSliceIndexInst (hashmap.List T))
+        (core.slice.index.SliceIndexUsizeSliceTInst (hashmap.List T))
         self.slots hash_mod
     let inserted ← hashmap.HashMap.insert_in_list T key value l
     if inserted
@@ -145,20 +158,21 @@ def hashmap.HashMap.insert_no_resize
         let l0 ← hashmap.HashMap.insert_in_list_back T key value l
         let v ←
           alloc.vec.Vec.index_mut_back (hashmap.List T) Usize
-            (core.slice.index.usize.coresliceindexSliceIndexInst (hashmap.List
-            T)) self.slots hash_mod l0
+            (core.slice.index.SliceIndexUsizeSliceTInst (hashmap.List T))
+            self.slots hash_mod l0
         Result.ret { self with num_entries := i0, slots := v }
     else
       do
         let l0 ← hashmap.HashMap.insert_in_list_back T key value l
         let v ←
           alloc.vec.Vec.index_mut_back (hashmap.List T) Usize
-            (core.slice.index.usize.coresliceindexSliceIndexInst (hashmap.List
-            T)) self.slots hash_mod l0
+            (core.slice.index.SliceIndexUsizeSliceTInst (hashmap.List T))
+            self.slots hash_mod l0
         Result.ret { self with slots := v }
 
-/- [hashmap_main::hashmap::HashMap::{0}::move_elements_from_list]: loop 0: merged forward/backward function
-   (there is a single backward function, and the forward function returns ()) -/
+/- [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::move_elements_from_list]: loop 0: merged forward/backward function
+   (there is a single backward function, and the forward function returns ())
+   Source: 'src/hashmap.rs', lines 183:4-196:5 -/
 divergent def hashmap.HashMap.move_elements_from_list_loop
   (T : Type) (ntable : hashmap.HashMap T) (ls : hashmap.List T) :
   Result (hashmap.HashMap T)
@@ -170,16 +184,18 @@ divergent def hashmap.HashMap.move_elements_from_list_loop
       hashmap.HashMap.move_elements_from_list_loop T ntable0 tl
   | hashmap.List.Nil => Result.ret ntable
 
-/- [hashmap_main::hashmap::HashMap::{0}::move_elements_from_list]: merged forward/backward function
-   (there is a single backward function, and the forward function returns ()) -/
+/- [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::move_elements_from_list]: merged forward/backward function
+   (there is a single backward function, and the forward function returns ())
+   Source: 'src/hashmap.rs', lines 183:4-183:72 -/
 def hashmap.HashMap.move_elements_from_list
   (T : Type) (ntable : hashmap.HashMap T) (ls : hashmap.List T) :
   Result (hashmap.HashMap T)
   :=
   hashmap.HashMap.move_elements_from_list_loop T ntable ls
 
-/- [hashmap_main::hashmap::HashMap::{0}::move_elements]: loop 0: merged forward/backward function
-   (there is a single backward function, and the forward function returns ()) -/
+/- [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::move_elements]: loop 0: merged forward/backward function
+   (there is a single backward function, and the forward function returns ())
+   Source: 'src/hashmap.rs', lines 171:4-180:5 -/
 divergent def hashmap.HashMap.move_elements_loop
   (T : Type) (ntable : hashmap.HashMap T)
   (slots : alloc.vec.Vec (hashmap.List T)) (i : Usize) :
@@ -191,21 +207,21 @@ divergent def hashmap.HashMap.move_elements_loop
     do
       let l ←
         alloc.vec.Vec.index_mut (hashmap.List T) Usize
-          (core.slice.index.usize.coresliceindexSliceIndexInst (hashmap.List
-          T)) slots i
+          (core.slice.index.SliceIndexUsizeSliceTInst (hashmap.List T)) slots i
       let ls := core.mem.replace (hashmap.List T) l hashmap.List.Nil
       let ntable0 ← hashmap.HashMap.move_elements_from_list T ntable ls
       let i1 ← i + 1#usize
       let l0 := core.mem.replace_back (hashmap.List T) l hashmap.List.Nil
       let slots0 ←
         alloc.vec.Vec.index_mut_back (hashmap.List T) Usize
-          (core.slice.index.usize.coresliceindexSliceIndexInst (hashmap.List
-          T)) slots i l0
+          (core.slice.index.SliceIndexUsizeSliceTInst (hashmap.List T)) slots i
+          l0
       hashmap.HashMap.move_elements_loop T ntable0 slots0 i1
   else Result.ret (ntable, slots)
 
-/- [hashmap_main::hashmap::HashMap::{0}::move_elements]: merged forward/backward function
-   (there is a single backward function, and the forward function returns ()) -/
+/- [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::move_elements]: merged forward/backward function
+   (there is a single backward function, and the forward function returns ())
+   Source: 'src/hashmap.rs', lines 171:4-171:95 -/
 def hashmap.HashMap.move_elements
   (T : Type) (ntable : hashmap.HashMap T)
   (slots : alloc.vec.Vec (hashmap.List T)) (i : Usize) :
@@ -213,8 +229,9 @@ def hashmap.HashMap.move_elements
   :=
   hashmap.HashMap.move_elements_loop T ntable slots i
 
-/- [hashmap_main::hashmap::HashMap::{0}::try_resize]: merged forward/backward function
-   (there is a single backward function, and the forward function returns ()) -/
+/- [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::try_resize]: merged forward/backward function
+   (there is a single backward function, and the forward function returns ())
+   Source: 'src/hashmap.rs', lines 140:4-140:28 -/
 def hashmap.HashMap.try_resize
   (T : Type) (self : hashmap.HashMap T) : Result (hashmap.HashMap T) :=
   do
@@ -238,8 +255,9 @@ def hashmap.HashMap.try_resize
           }
     else Result.ret { self with max_load_factor := (i, i0) }
 
-/- [hashmap_main::hashmap::HashMap::{0}::insert]: merged forward/backward function
-   (there is a single backward function, and the forward function returns ()) -/
+/- [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::insert]: merged forward/backward function
+   (there is a single backward function, and the forward function returns ())
+   Source: 'src/hashmap.rs', lines 129:4-129:48 -/
 def hashmap.HashMap.insert
   (T : Type) (self : hashmap.HashMap T) (key : Usize) (value : T) :
   Result (hashmap.HashMap T)
@@ -251,7 +269,8 @@ def hashmap.HashMap.insert
     then hashmap.HashMap.try_resize T self0
     else Result.ret self0
 
-/- [hashmap_main::hashmap::HashMap::{0}::contains_key_in_list]: loop 0: forward function -/
+/- [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::contains_key_in_list]: loop 0: forward function
+   Source: 'src/hashmap.rs', lines 206:4-219:5 -/
 divergent def hashmap.HashMap.contains_key_in_list_loop
   (T : Type) (key : Usize) (ls : hashmap.List T) : Result Bool :=
   match ls with
@@ -261,12 +280,14 @@ divergent def hashmap.HashMap.contains_key_in_list_loop
     else hashmap.HashMap.contains_key_in_list_loop T key tl
   | hashmap.List.Nil => Result.ret false
 
-/- [hashmap_main::hashmap::HashMap::{0}::contains_key_in_list]: forward function -/
+/- [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::contains_key_in_list]: forward function
+   Source: 'src/hashmap.rs', lines 206:4-206:68 -/
 def hashmap.HashMap.contains_key_in_list
   (T : Type) (key : Usize) (ls : hashmap.List T) : Result Bool :=
   hashmap.HashMap.contains_key_in_list_loop T key ls
 
-/- [hashmap_main::hashmap::HashMap::{0}::contains_key]: forward function -/
+/- [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::contains_key]: forward function
+   Source: 'src/hashmap.rs', lines 199:4-199:49 -/
 def hashmap.HashMap.contains_key
   (T : Type) (self : hashmap.HashMap T) (key : Usize) : Result Bool :=
   do
@@ -275,11 +296,12 @@ def hashmap.HashMap.contains_key
     let hash_mod ← hash % i
     let l ←
       alloc.vec.Vec.index (hashmap.List T) Usize
-        (core.slice.index.usize.coresliceindexSliceIndexInst (hashmap.List T))
+        (core.slice.index.SliceIndexUsizeSliceTInst (hashmap.List T))
         self.slots hash_mod
     hashmap.HashMap.contains_key_in_list T key l
 
-/- [hashmap_main::hashmap::HashMap::{0}::get_in_list]: loop 0: forward function -/
+/- [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::get_in_list]: loop 0: forward function
+   Source: 'src/hashmap.rs', lines 224:4-237:5 -/
 divergent def hashmap.HashMap.get_in_list_loop
   (T : Type) (key : Usize) (ls : hashmap.List T) : Result T :=
   match ls with
@@ -289,12 +311,14 @@ divergent def hashmap.HashMap.get_in_list_loop
     else hashmap.HashMap.get_in_list_loop T key tl
   | hashmap.List.Nil => Result.fail Error.panic
 
-/- [hashmap_main::hashmap::HashMap::{0}::get_in_list]: forward function -/
+/- [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::get_in_list]: forward function
+   Source: 'src/hashmap.rs', lines 224:4-224:70 -/
 def hashmap.HashMap.get_in_list
   (T : Type) (key : Usize) (ls : hashmap.List T) : Result T :=
   hashmap.HashMap.get_in_list_loop T key ls
 
-/- [hashmap_main::hashmap::HashMap::{0}::get]: forward function -/
+/- [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::get]: forward function
+   Source: 'src/hashmap.rs', lines 239:4-239:55 -/
 def hashmap.HashMap.get
   (T : Type) (self : hashmap.HashMap T) (key : Usize) : Result T :=
   do
@@ -303,11 +327,12 @@ def hashmap.HashMap.get
     let hash_mod ← hash % i
     let l ←
       alloc.vec.Vec.index (hashmap.List T) Usize
-        (core.slice.index.usize.coresliceindexSliceIndexInst (hashmap.List T))
+        (core.slice.index.SliceIndexUsizeSliceTInst (hashmap.List T))
         self.slots hash_mod
     hashmap.HashMap.get_in_list T key l
 
-/- [hashmap_main::hashmap::HashMap::{0}::get_mut_in_list]: loop 0: forward function -/
+/- [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::get_mut_in_list]: loop 0: forward function
+   Source: 'src/hashmap.rs', lines 245:4-254:5 -/
 divergent def hashmap.HashMap.get_mut_in_list_loop
   (T : Type) (ls : hashmap.List T) (key : Usize) : Result T :=
   match ls with
@@ -317,12 +342,14 @@ divergent def hashmap.HashMap.get_mut_in_list_loop
     else hashmap.HashMap.get_mut_in_list_loop T tl key
   | hashmap.List.Nil => Result.fail Error.panic
 
-/- [hashmap_main::hashmap::HashMap::{0}::get_mut_in_list]: forward function -/
+/- [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::get_mut_in_list]: forward function
+   Source: 'src/hashmap.rs', lines 245:4-245:86 -/
 def hashmap.HashMap.get_mut_in_list
   (T : Type) (ls : hashmap.List T) (key : Usize) : Result T :=
   hashmap.HashMap.get_mut_in_list_loop T ls key
 
-/- [hashmap_main::hashmap::HashMap::{0}::get_mut_in_list]: loop 0: backward function 0 -/
+/- [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::get_mut_in_list]: loop 0: backward function 0
+   Source: 'src/hashmap.rs', lines 245:4-254:5 -/
 divergent def hashmap.HashMap.get_mut_in_list_loop_back
   (T : Type) (ls : hashmap.List T) (key : Usize) (ret0 : T) :
   Result (hashmap.List T)
@@ -337,14 +364,16 @@ divergent def hashmap.HashMap.get_mut_in_list_loop_back
         Result.ret (hashmap.List.Cons ckey cvalue tl0)
   | hashmap.List.Nil => Result.fail Error.panic
 
-/- [hashmap_main::hashmap::HashMap::{0}::get_mut_in_list]: backward function 0 -/
+/- [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::get_mut_in_list]: backward function 0
+   Source: 'src/hashmap.rs', lines 245:4-245:86 -/
 def hashmap.HashMap.get_mut_in_list_back
   (T : Type) (ls : hashmap.List T) (key : Usize) (ret0 : T) :
   Result (hashmap.List T)
   :=
   hashmap.HashMap.get_mut_in_list_loop_back T ls key ret0
 
-/- [hashmap_main::hashmap::HashMap::{0}::get_mut]: forward function -/
+/- [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::get_mut]: forward function
+   Source: 'src/hashmap.rs', lines 257:4-257:67 -/
 def hashmap.HashMap.get_mut
   (T : Type) (self : hashmap.HashMap T) (key : Usize) : Result T :=
   do
@@ -353,11 +382,12 @@ def hashmap.HashMap.get_mut
     let hash_mod ← hash % i
     let l ←
       alloc.vec.Vec.index_mut (hashmap.List T) Usize
-        (core.slice.index.usize.coresliceindexSliceIndexInst (hashmap.List T))
+        (core.slice.index.SliceIndexUsizeSliceTInst (hashmap.List T))
         self.slots hash_mod
     hashmap.HashMap.get_mut_in_list T l key
 
-/- [hashmap_main::hashmap::HashMap::{0}::get_mut]: backward function 0 -/
+/- [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::get_mut]: backward function 0
+   Source: 'src/hashmap.rs', lines 257:4-257:67 -/
 def hashmap.HashMap.get_mut_back
   (T : Type) (self : hashmap.HashMap T) (key : Usize) (ret0 : T) :
   Result (hashmap.HashMap T)
@@ -368,16 +398,17 @@ def hashmap.HashMap.get_mut_back
     let hash_mod ← hash % i
     let l ←
       alloc.vec.Vec.index_mut (hashmap.List T) Usize
-        (core.slice.index.usize.coresliceindexSliceIndexInst (hashmap.List T))
+        (core.slice.index.SliceIndexUsizeSliceTInst (hashmap.List T))
         self.slots hash_mod
     let l0 ← hashmap.HashMap.get_mut_in_list_back T l key ret0
     let v ←
       alloc.vec.Vec.index_mut_back (hashmap.List T) Usize
-        (core.slice.index.usize.coresliceindexSliceIndexInst (hashmap.List T))
+        (core.slice.index.SliceIndexUsizeSliceTInst (hashmap.List T))
         self.slots hash_mod l0
     Result.ret { self with slots := v }
 
-/- [hashmap_main::hashmap::HashMap::{0}::remove_from_list]: loop 0: forward function -/
+/- [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::remove_from_list]: loop 0: forward function
+   Source: 'src/hashmap.rs', lines 265:4-291:5 -/
 divergent def hashmap.HashMap.remove_from_list_loop
   (T : Type) (key : Usize) (ls : hashmap.List T) : Result (Option T) :=
   match ls with
@@ -393,12 +424,14 @@ divergent def hashmap.HashMap.remove_from_list_loop
     else hashmap.HashMap.remove_from_list_loop T key tl
   | hashmap.List.Nil => Result.ret none
 
-/- [hashmap_main::hashmap::HashMap::{0}::remove_from_list]: forward function -/
+/- [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::remove_from_list]: forward function
+   Source: 'src/hashmap.rs', lines 265:4-265:69 -/
 def hashmap.HashMap.remove_from_list
   (T : Type) (key : Usize) (ls : hashmap.List T) : Result (Option T) :=
   hashmap.HashMap.remove_from_list_loop T key ls
 
-/- [hashmap_main::hashmap::HashMap::{0}::remove_from_list]: loop 0: backward function 1 -/
+/- [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::remove_from_list]: loop 0: backward function 1
+   Source: 'src/hashmap.rs', lines 265:4-291:5 -/
 divergent def hashmap.HashMap.remove_from_list_loop_back
   (T : Type) (key : Usize) (ls : hashmap.List T) : Result (hashmap.List T) :=
   match ls with
@@ -417,12 +450,14 @@ divergent def hashmap.HashMap.remove_from_list_loop_back
         Result.ret (hashmap.List.Cons ckey t tl0)
   | hashmap.List.Nil => Result.ret hashmap.List.Nil
 
-/- [hashmap_main::hashmap::HashMap::{0}::remove_from_list]: backward function 1 -/
+/- [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::remove_from_list]: backward function 1
+   Source: 'src/hashmap.rs', lines 265:4-265:69 -/
 def hashmap.HashMap.remove_from_list_back
   (T : Type) (key : Usize) (ls : hashmap.List T) : Result (hashmap.List T) :=
   hashmap.HashMap.remove_from_list_loop_back T key ls
 
-/- [hashmap_main::hashmap::HashMap::{0}::remove]: forward function -/
+/- [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::remove]: forward function
+   Source: 'src/hashmap.rs', lines 294:4-294:52 -/
 def hashmap.HashMap.remove
   (T : Type) (self : hashmap.HashMap T) (key : Usize) : Result (Option T) :=
   do
@@ -431,7 +466,7 @@ def hashmap.HashMap.remove
     let hash_mod ← hash % i
     let l ←
       alloc.vec.Vec.index_mut (hashmap.List T) Usize
-        (core.slice.index.usize.coresliceindexSliceIndexInst (hashmap.List T))
+        (core.slice.index.SliceIndexUsizeSliceTInst (hashmap.List T))
         self.slots hash_mod
     let x ← hashmap.HashMap.remove_from_list T key l
     match x with
@@ -440,7 +475,8 @@ def hashmap.HashMap.remove
                    let _ ← self.num_entries - 1#usize
                    Result.ret (some x0)
 
-/- [hashmap_main::hashmap::HashMap::{0}::remove]: backward function 0 -/
+/- [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::remove]: backward function 0
+   Source: 'src/hashmap.rs', lines 294:4-294:52 -/
 def hashmap.HashMap.remove_back
   (T : Type) (self : hashmap.HashMap T) (key : Usize) :
   Result (hashmap.HashMap T)
@@ -451,7 +487,7 @@ def hashmap.HashMap.remove_back
     let hash_mod ← hash % i
     let l ←
       alloc.vec.Vec.index_mut (hashmap.List T) Usize
-        (core.slice.index.usize.coresliceindexSliceIndexInst (hashmap.List T))
+        (core.slice.index.SliceIndexUsizeSliceTInst (hashmap.List T))
         self.slots hash_mod
     let x ← hashmap.HashMap.remove_from_list T key l
     match x with
@@ -460,8 +496,8 @@ def hashmap.HashMap.remove_back
         let l0 ← hashmap.HashMap.remove_from_list_back T key l
         let v ←
           alloc.vec.Vec.index_mut_back (hashmap.List T) Usize
-            (core.slice.index.usize.coresliceindexSliceIndexInst (hashmap.List
-            T)) self.slots hash_mod l0
+            (core.slice.index.SliceIndexUsizeSliceTInst (hashmap.List T))
+            self.slots hash_mod l0
         Result.ret { self with slots := v }
     | some x0 =>
       do
@@ -469,11 +505,12 @@ def hashmap.HashMap.remove_back
         let l0 ← hashmap.HashMap.remove_from_list_back T key l
         let v ←
           alloc.vec.Vec.index_mut_back (hashmap.List T) Usize
-            (core.slice.index.usize.coresliceindexSliceIndexInst (hashmap.List
-            T)) self.slots hash_mod l0
+            (core.slice.index.SliceIndexUsizeSliceTInst (hashmap.List T))
+            self.slots hash_mod l0
         Result.ret { self with num_entries := i0, slots := v }
 
-/- [hashmap_main::hashmap::test1]: forward function -/
+/- [hashmap_main::hashmap::test1]: forward function
+   Source: 'src/hashmap.rs', lines 315:0-315:10 -/
 def hashmap.test1 : Result Unit :=
   do
     let hm ← hashmap.HashMap.new U64
@@ -516,7 +553,8 @@ def hashmap.test1 : Result Unit :=
                           then Result.fail Error.panic
                           else Result.ret ()
 
-/- [hashmap_main::insert_on_disk]: forward function -/
+/- [hashmap_main::insert_on_disk]: forward function
+   Source: 'src/hashmap_main.rs', lines 7:0-7:43 -/
 def insert_on_disk
   (key : Usize) (value : U64) (st : State) : Result (State × Unit) :=
   do
@@ -525,7 +563,8 @@ def insert_on_disk
     let (st1, _) ← hashmap_utils.serialize hm0 st0
     Result.ret (st1, ())
 
-/- [hashmap_main::main]: forward function -/
+/- [hashmap_main::main]: forward function
+   Source: 'src/hashmap_main.rs', lines 16:0-16:13 -/
 def main : Result Unit :=
   Result.ret ()
 
diff --git a/tests/lean/HashmapMain/FunsExternal_Template.lean b/tests/lean/HashmapMain/FunsExternal_Template.lean
index f537fc8f..02ca5b0e 100644
--- a/tests/lean/HashmapMain/FunsExternal_Template.lean
+++ b/tests/lean/HashmapMain/FunsExternal_Template.lean
@@ -6,11 +6,13 @@ import HashmapMain.Types
 open Primitives
 open hashmap_main
 
-/- [hashmap_main::hashmap_utils::deserialize]: forward function -/
+/- [hashmap_main::hashmap_utils::deserialize]: forward function
+   Source: 'src/hashmap_utils.rs', lines 10:0-10:43 -/
 axiom hashmap_utils.deserialize
   : State → Result (State × (hashmap.HashMap U64))
 
-/- [hashmap_main::hashmap_utils::serialize]: forward function -/
+/- [hashmap_main::hashmap_utils::serialize]: forward function
+   Source: 'src/hashmap_utils.rs', lines 5:0-5:42 -/
 axiom hashmap_utils.serialize
   : hashmap.HashMap U64 → State → Result (State × Unit)
 
diff --git a/tests/lean/HashmapMain/Types.lean b/tests/lean/HashmapMain/Types.lean
index 065c109b..f7be6719 100644
--- a/tests/lean/HashmapMain/Types.lean
+++ b/tests/lean/HashmapMain/Types.lean
@@ -5,12 +5,14 @@ open Primitives
 
 namespace hashmap_main
 
-/- [hashmap_main::hashmap::List] -/
+/- [hashmap_main::hashmap::List]
+   Source: 'src/hashmap.rs', lines 19:0-19:16 -/
 inductive hashmap.List (T : Type) :=
 | Cons : Usize → T → hashmap.List T → hashmap.List T
 | Nil : hashmap.List T
 
-/- [hashmap_main::hashmap::HashMap] -/
+/- [hashmap_main::hashmap::HashMap]
+   Source: 'src/hashmap.rs', lines 35:0-35:21 -/
 structure hashmap.HashMap (T : Type) where
   num_entries : Usize
   max_load_factor : (Usize × Usize)
diff --git a/tests/lean/Loops.lean b/tests/lean/Loops.lean
index c6360338..ae1d87aa 100644
--- a/tests/lean/Loops.lean
+++ b/tests/lean/Loops.lean
@@ -5,7 +5,8 @@ open Primitives
 
 namespace loops
 
-/- [loops::sum]: loop 0: forward function -/
+/- [loops::sum]: loop 0: forward function
+   Source: 'src/loops.rs', lines 4:0-14:1 -/
 divergent def sum_loop (max : U32) (i : U32) (s : U32) : Result U32 :=
   if i < max
   then do
@@ -14,11 +15,13 @@ divergent def sum_loop (max : U32) (i : U32) (s : U32) : Result U32 :=
          sum_loop max i0 s0
   else s * 2#u32
 
-/- [loops::sum]: forward function -/
+/- [loops::sum]: forward function
+   Source: 'src/loops.rs', lines 4:0-4:27 -/
 def sum (max : U32) : Result U32 :=
   sum_loop max 0#u32 0#u32
 
-/- [loops::sum_with_mut_borrows]: loop 0: forward function -/
+/- [loops::sum_with_mut_borrows]: loop 0: forward function
+   Source: 'src/loops.rs', lines 19:0-31:1 -/
 divergent def sum_with_mut_borrows_loop
   (max : U32) (mi : U32) (ms : U32) : Result U32 :=
   if mi < max
@@ -29,11 +32,13 @@ divergent def sum_with_mut_borrows_loop
       sum_with_mut_borrows_loop max mi0 ms0
   else ms * 2#u32
 
-/- [loops::sum_with_mut_borrows]: forward function -/
+/- [loops::sum_with_mut_borrows]: forward function
+   Source: 'src/loops.rs', lines 19:0-19:44 -/
 def sum_with_mut_borrows (max : U32) : Result U32 :=
   sum_with_mut_borrows_loop max 0#u32 0#u32
 
-/- [loops::sum_with_shared_borrows]: loop 0: forward function -/
+/- [loops::sum_with_shared_borrows]: loop 0: forward function
+   Source: 'src/loops.rs', lines 34:0-48:1 -/
 divergent def sum_with_shared_borrows_loop
   (max : U32) (i : U32) (s : U32) : Result U32 :=
   if i < max
@@ -44,12 +49,14 @@ divergent def sum_with_shared_borrows_loop
       sum_with_shared_borrows_loop max i0 s0
   else s * 2#u32
 
-/- [loops::sum_with_shared_borrows]: forward function -/
+/- [loops::sum_with_shared_borrows]: forward function
+   Source: 'src/loops.rs', lines 34:0-34:47 -/
 def sum_with_shared_borrows (max : U32) : Result U32 :=
   sum_with_shared_borrows_loop max 0#u32 0#u32
 
 /- [loops::clear]: loop 0: merged forward/backward function
-   (there is a single backward function, and the forward function returns ()) -/
+   (there is a single backward function, and the forward function returns ())
+   Source: 'src/loops.rs', lines 52:0-58:1 -/
 divergent def clear_loop
   (v : alloc.vec.Vec U32) (i : Usize) : Result (alloc.vec.Vec U32) :=
   let i0 := alloc.vec.Vec.len U32 v
@@ -59,21 +66,24 @@ divergent def clear_loop
       let i1 ← i + 1#usize
       let v0 ←
         alloc.vec.Vec.index_mut_back U32 Usize
-          (core.slice.index.usize.coresliceindexSliceIndexInst U32) v i 0#u32
+          (core.slice.index.SliceIndexUsizeSliceTInst U32) v i 0#u32
       clear_loop v0 i1
   else Result.ret v
 
 /- [loops::clear]: merged forward/backward function
-   (there is a single backward function, and the forward function returns ()) -/
+   (there is a single backward function, and the forward function returns ())
+   Source: 'src/loops.rs', lines 52:0-52:30 -/
 def clear (v : alloc.vec.Vec U32) : Result (alloc.vec.Vec U32) :=
   clear_loop v 0#usize
 
-/- [loops::List] -/
+/- [loops::List]
+   Source: 'src/loops.rs', lines 60:0-60:16 -/
 inductive List (T : Type) :=
 | Cons : T → List T → List T
 | Nil : List T
 
-/- [loops::list_mem]: loop 0: forward function -/
+/- [loops::list_mem]: loop 0: forward function
+   Source: 'src/loops.rs', lines 66:0-75:1 -/
 divergent def list_mem_loop (x : U32) (ls : List U32) : Result Bool :=
   match ls with
   | List.Cons y tl => if y = x
@@ -81,11 +91,13 @@ divergent def list_mem_loop (x : U32) (ls : List U32) : Result Bool :=
                       else list_mem_loop x tl
   | List.Nil => Result.ret false
 
-/- [loops::list_mem]: forward function -/
+/- [loops::list_mem]: forward function
+   Source: 'src/loops.rs', lines 66:0-66:52 -/
 def list_mem (x : U32) (ls : List U32) : Result Bool :=
   list_mem_loop x ls
 
-/- [loops::list_nth_mut_loop]: loop 0: forward function -/
+/- [loops::list_nth_mut_loop]: loop 0: forward function
+   Source: 'src/loops.rs', lines 78:0-88:1 -/
 divergent def list_nth_mut_loop_loop
   (T : Type) (ls : List T) (i : U32) : Result T :=
   match ls with
@@ -97,11 +109,13 @@ divergent def list_nth_mut_loop_loop
            list_nth_mut_loop_loop T tl i0
   | List.Nil => Result.fail Error.panic
 
-/- [loops::list_nth_mut_loop]: forward function -/
+/- [loops::list_nth_mut_loop]: forward function
+   Source: 'src/loops.rs', lines 78:0-78:71 -/
 def list_nth_mut_loop (T : Type) (ls : List T) (i : U32) : Result T :=
   list_nth_mut_loop_loop T ls i
 
-/- [loops::list_nth_mut_loop]: loop 0: backward function 0 -/
+/- [loops::list_nth_mut_loop]: loop 0: backward function 0
+   Source: 'src/loops.rs', lines 78:0-88:1 -/
 divergent def list_nth_mut_loop_loop_back
   (T : Type) (ls : List T) (i : U32) (ret0 : T) : Result (List T) :=
   match ls with
@@ -115,12 +129,14 @@ divergent def list_nth_mut_loop_loop_back
         Result.ret (List.Cons x tl0)
   | List.Nil => Result.fail Error.panic
 
-/- [loops::list_nth_mut_loop]: backward function 0 -/
+/- [loops::list_nth_mut_loop]: backward function 0
+   Source: 'src/loops.rs', lines 78:0-78:71 -/
 def list_nth_mut_loop_back
   (T : Type) (ls : List T) (i : U32) (ret0 : T) : Result (List T) :=
   list_nth_mut_loop_loop_back T ls i ret0
 
-/- [loops::list_nth_shared_loop]: loop 0: forward function -/
+/- [loops::list_nth_shared_loop]: loop 0: forward function
+   Source: 'src/loops.rs', lines 91:0-101:1 -/
 divergent def list_nth_shared_loop_loop
   (T : Type) (ls : List T) (i : U32) : Result T :=
   match ls with
@@ -132,11 +148,13 @@ divergent def list_nth_shared_loop_loop
            list_nth_shared_loop_loop T tl i0
   | List.Nil => Result.fail Error.panic
 
-/- [loops::list_nth_shared_loop]: forward function -/
+/- [loops::list_nth_shared_loop]: forward function
+   Source: 'src/loops.rs', lines 91:0-91:66 -/
 def list_nth_shared_loop (T : Type) (ls : List T) (i : U32) : Result T :=
   list_nth_shared_loop_loop T ls i
 
-/- [loops::get_elem_mut]: loop 0: forward function -/
+/- [loops::get_elem_mut]: loop 0: forward function
+   Source: 'src/loops.rs', lines 103:0-117:1 -/
 divergent def get_elem_mut_loop (x : Usize) (ls : List Usize) : Result Usize :=
   match ls with
   | List.Cons y tl => if y = x
@@ -144,17 +162,18 @@ divergent def get_elem_mut_loop (x : Usize) (ls : List Usize) : Result Usize :=
                       else get_elem_mut_loop x tl
   | List.Nil => Result.fail Error.panic
 
-/- [loops::get_elem_mut]: forward function -/
+/- [loops::get_elem_mut]: forward function
+   Source: 'src/loops.rs', lines 103:0-103:73 -/
 def get_elem_mut
   (slots : alloc.vec.Vec (List Usize)) (x : Usize) : Result Usize :=
   do
     let l ←
       alloc.vec.Vec.index_mut (List Usize) Usize
-        (core.slice.index.usize.coresliceindexSliceIndexInst (List Usize))
-        slots 0#usize
+        (core.slice.index.SliceIndexUsizeSliceTInst (List Usize)) slots 0#usize
     get_elem_mut_loop x l
 
-/- [loops::get_elem_mut]: loop 0: backward function 0 -/
+/- [loops::get_elem_mut]: loop 0: backward function 0
+   Source: 'src/loops.rs', lines 103:0-117:1 -/
 divergent def get_elem_mut_loop_back
   (x : Usize) (ls : List Usize) (ret0 : Usize) : Result (List Usize) :=
   match ls with
@@ -167,7 +186,8 @@ divergent def get_elem_mut_loop_back
         Result.ret (List.Cons y tl0)
   | List.Nil => Result.fail Error.panic
 
-/- [loops::get_elem_mut]: backward function 0 -/
+/- [loops::get_elem_mut]: backward function 0
+   Source: 'src/loops.rs', lines 103:0-103:73 -/
 def get_elem_mut_back
   (slots : alloc.vec.Vec (List Usize)) (x : Usize) (ret0 : Usize) :
   Result (alloc.vec.Vec (List Usize))
@@ -175,14 +195,14 @@ def get_elem_mut_back
   do
     let l ←
       alloc.vec.Vec.index_mut (List Usize) Usize
-        (core.slice.index.usize.coresliceindexSliceIndexInst (List Usize))
-        slots 0#usize
+        (core.slice.index.SliceIndexUsizeSliceTInst (List Usize)) slots 0#usize
     let l0 ← get_elem_mut_loop_back x l ret0
     alloc.vec.Vec.index_mut_back (List Usize) Usize
-      (core.slice.index.usize.coresliceindexSliceIndexInst (List Usize)) slots
-      0#usize l0
+      (core.slice.index.SliceIndexUsizeSliceTInst (List Usize)) slots 0#usize
+      l0
 
-/- [loops::get_elem_shared]: loop 0: forward function -/
+/- [loops::get_elem_shared]: loop 0: forward function
+   Source: 'src/loops.rs', lines 119:0-133:1 -/
 divergent def get_elem_shared_loop
   (x : Usize) (ls : List Usize) : Result Usize :=
   match ls with
@@ -191,29 +211,33 @@ divergent def get_elem_shared_loop
                       else get_elem_shared_loop x tl
   | List.Nil => Result.fail Error.panic
 
-/- [loops::get_elem_shared]: forward function -/
+/- [loops::get_elem_shared]: forward function
+   Source: 'src/loops.rs', lines 119:0-119:68 -/
 def get_elem_shared
   (slots : alloc.vec.Vec (List Usize)) (x : Usize) : Result Usize :=
   do
     let l ←
       alloc.vec.Vec.index (List Usize) Usize
-        (core.slice.index.usize.coresliceindexSliceIndexInst (List Usize))
-        slots 0#usize
+        (core.slice.index.SliceIndexUsizeSliceTInst (List Usize)) slots 0#usize
     get_elem_shared_loop x l
 
-/- [loops::id_mut]: forward function -/
+/- [loops::id_mut]: forward function
+   Source: 'src/loops.rs', lines 135:0-135:50 -/
 def id_mut (T : Type) (ls : List T) : Result (List T) :=
   Result.ret ls
 
-/- [loops::id_mut]: backward function 0 -/
+/- [loops::id_mut]: backward function 0
+   Source: 'src/loops.rs', lines 135:0-135:50 -/
 def id_mut_back (T : Type) (ls : List T) (ret0 : List T) : Result (List T) :=
   Result.ret ret0
 
-/- [loops::id_shared]: forward function -/
+/- [loops::id_shared]: forward function
+   Source: 'src/loops.rs', lines 139:0-139:45 -/
 def id_shared (T : Type) (ls : List T) : Result (List T) :=
   Result.ret ls
 
-/- [loops::list_nth_mut_loop_with_id]: loop 0: forward function -/
+/- [loops::list_nth_mut_loop_with_id]: loop 0: forward function
+   Source: 'src/loops.rs', lines 144:0-155:1 -/
 divergent def list_nth_mut_loop_with_id_loop
   (T : Type) (i : U32) (ls : List T) : Result T :=
   match ls with
@@ -225,13 +249,15 @@ divergent def list_nth_mut_loop_with_id_loop
            list_nth_mut_loop_with_id_loop T i0 tl
   | List.Nil => Result.fail Error.panic
 
-/- [loops::list_nth_mut_loop_with_id]: forward function -/
+/- [loops::list_nth_mut_loop_with_id]: forward function
+   Source: 'src/loops.rs', lines 144:0-144:75 -/
 def list_nth_mut_loop_with_id (T : Type) (ls : List T) (i : U32) : Result T :=
   do
     let ls0 ← id_mut T ls
     list_nth_mut_loop_with_id_loop T i ls0
 
-/- [loops::list_nth_mut_loop_with_id]: loop 0: backward function 0 -/
+/- [loops::list_nth_mut_loop_with_id]: loop 0: backward function 0
+   Source: 'src/loops.rs', lines 144:0-155:1 -/
 divergent def list_nth_mut_loop_with_id_loop_back
   (T : Type) (i : U32) (ls : List T) (ret0 : T) : Result (List T) :=
   match ls with
@@ -245,7 +271,8 @@ divergent def list_nth_mut_loop_with_id_loop_back
         Result.ret (List.Cons x tl0)
   | List.Nil => Result.fail Error.panic
 
-/- [loops::list_nth_mut_loop_with_id]: backward function 0 -/
+/- [loops::list_nth_mut_loop_with_id]: backward function 0
+   Source: 'src/loops.rs', lines 144:0-144:75 -/
 def list_nth_mut_loop_with_id_back
   (T : Type) (ls : List T) (i : U32) (ret0 : T) : Result (List T) :=
   do
@@ -253,7 +280,8 @@ def list_nth_mut_loop_with_id_back
     let l ← list_nth_mut_loop_with_id_loop_back T i ls0 ret0
     id_mut_back T ls l
 
-/- [loops::list_nth_shared_loop_with_id]: loop 0: forward function -/
+/- [loops::list_nth_shared_loop_with_id]: loop 0: forward function
+   Source: 'src/loops.rs', lines 158:0-169:1 -/
 divergent def list_nth_shared_loop_with_id_loop
   (T : Type) (i : U32) (ls : List T) : Result T :=
   match ls with
@@ -265,14 +293,16 @@ divergent def list_nth_shared_loop_with_id_loop
            list_nth_shared_loop_with_id_loop T i0 tl
   | List.Nil => Result.fail Error.panic
 
-/- [loops::list_nth_shared_loop_with_id]: forward function -/
+/- [loops::list_nth_shared_loop_with_id]: forward function
+   Source: 'src/loops.rs', lines 158:0-158:70 -/
 def list_nth_shared_loop_with_id
   (T : Type) (ls : List T) (i : U32) : Result T :=
   do
     let ls0 ← id_shared T ls
     list_nth_shared_loop_with_id_loop T i ls0
 
-/- [loops::list_nth_mut_loop_pair]: loop 0: forward function -/
+/- [loops::list_nth_mut_loop_pair]: loop 0: forward function
+   Source: 'src/loops.rs', lines 174:0-195:1 -/
 divergent def list_nth_mut_loop_pair_loop
   (T : Type) (ls0 : List T) (ls1 : List T) (i : U32) : Result (T × T) :=
   match ls0 with
@@ -287,12 +317,14 @@ divergent def list_nth_mut_loop_pair_loop
     | List.Nil => Result.fail Error.panic
   | List.Nil => Result.fail Error.panic
 
-/- [loops::list_nth_mut_loop_pair]: forward function -/
+/- [loops::list_nth_mut_loop_pair]: forward function
+   Source: 'src/loops.rs', lines 174:0-178:27 -/
 def list_nth_mut_loop_pair
   (T : Type) (ls0 : List T) (ls1 : List T) (i : U32) : Result (T × T) :=
   list_nth_mut_loop_pair_loop T ls0 ls1 i
 
-/- [loops::list_nth_mut_loop_pair]: loop 0: backward function 0 -/
+/- [loops::list_nth_mut_loop_pair]: loop 0: backward function 0
+   Source: 'src/loops.rs', lines 174:0-195:1 -/
 divergent def list_nth_mut_loop_pair_loop_back'a
   (T : Type) (ls0 : List T) (ls1 : List T) (i : U32) (ret0 : T) :
   Result (List T)
@@ -311,14 +343,16 @@ divergent def list_nth_mut_loop_pair_loop_back'a
     | List.Nil => Result.fail Error.panic
   | List.Nil => Result.fail Error.panic
 
-/- [loops::list_nth_mut_loop_pair]: backward function 0 -/
+/- [loops::list_nth_mut_loop_pair]: backward function 0
+   Source: 'src/loops.rs', lines 174:0-178:27 -/
 def list_nth_mut_loop_pair_back'a
   (T : Type) (ls0 : List T) (ls1 : List T) (i : U32) (ret0 : T) :
   Result (List T)
   :=
   list_nth_mut_loop_pair_loop_back'a T ls0 ls1 i ret0
 
-/- [loops::list_nth_mut_loop_pair]: loop 0: backward function 1 -/
+/- [loops::list_nth_mut_loop_pair]: loop 0: backward function 1
+   Source: 'src/loops.rs', lines 174:0-195:1 -/
 divergent def list_nth_mut_loop_pair_loop_back'b
   (T : Type) (ls0 : List T) (ls1 : List T) (i : U32) (ret0 : T) :
   Result (List T)
@@ -337,14 +371,16 @@ divergent def list_nth_mut_loop_pair_loop_back'b
     | List.Nil => Result.fail Error.panic
   | List.Nil => Result.fail Error.panic
 
-/- [loops::list_nth_mut_loop_pair]: backward function 1 -/
+/- [loops::list_nth_mut_loop_pair]: backward function 1
+   Source: 'src/loops.rs', lines 174:0-178:27 -/
 def list_nth_mut_loop_pair_back'b
   (T : Type) (ls0 : List T) (ls1 : List T) (i : U32) (ret0 : T) :
   Result (List T)
   :=
   list_nth_mut_loop_pair_loop_back'b T ls0 ls1 i ret0
 
-/- [loops::list_nth_shared_loop_pair]: loop 0: forward function -/
+/- [loops::list_nth_shared_loop_pair]: loop 0: forward function
+   Source: 'src/loops.rs', lines 198:0-219:1 -/
 divergent def list_nth_shared_loop_pair_loop
   (T : Type) (ls0 : List T) (ls1 : List T) (i : U32) : Result (T × T) :=
   match ls0 with
@@ -359,12 +395,14 @@ divergent def list_nth_shared_loop_pair_loop
     | List.Nil => Result.fail Error.panic
   | List.Nil => Result.fail Error.panic
 
-/- [loops::list_nth_shared_loop_pair]: forward function -/
+/- [loops::list_nth_shared_loop_pair]: forward function
+   Source: 'src/loops.rs', lines 198:0-202:19 -/
 def list_nth_shared_loop_pair
   (T : Type) (ls0 : List T) (ls1 : List T) (i : U32) : Result (T × T) :=
   list_nth_shared_loop_pair_loop T ls0 ls1 i
 
-/- [loops::list_nth_mut_loop_pair_merge]: loop 0: forward function -/
+/- [loops::list_nth_mut_loop_pair_merge]: loop 0: forward function
+   Source: 'src/loops.rs', lines 223:0-238:1 -/
 divergent def list_nth_mut_loop_pair_merge_loop
   (T : Type) (ls0 : List T) (ls1 : List T) (i : U32) : Result (T × T) :=
   match ls0 with
@@ -380,12 +418,14 @@ divergent def list_nth_mut_loop_pair_merge_loop
     | List.Nil => Result.fail Error.panic
   | List.Nil => Result.fail Error.panic
 
-/- [loops::list_nth_mut_loop_pair_merge]: forward function -/
+/- [loops::list_nth_mut_loop_pair_merge]: forward function
+   Source: 'src/loops.rs', lines 223:0-227:27 -/
 def list_nth_mut_loop_pair_merge
   (T : Type) (ls0 : List T) (ls1 : List T) (i : U32) : Result (T × T) :=
   list_nth_mut_loop_pair_merge_loop T ls0 ls1 i
 
-/- [loops::list_nth_mut_loop_pair_merge]: loop 0: backward function 0 -/
+/- [loops::list_nth_mut_loop_pair_merge]: loop 0: backward function 0
+   Source: 'src/loops.rs', lines 223:0-238:1 -/
 divergent def list_nth_mut_loop_pair_merge_loop_back
   (T : Type) (ls0 : List T) (ls1 : List T) (i : U32) (ret0 : (T × T)) :
   Result ((List T) × (List T))
@@ -406,14 +446,16 @@ divergent def list_nth_mut_loop_pair_merge_loop_back
     | List.Nil => Result.fail Error.panic
   | List.Nil => Result.fail Error.panic
 
-/- [loops::list_nth_mut_loop_pair_merge]: backward function 0 -/
+/- [loops::list_nth_mut_loop_pair_merge]: backward function 0
+   Source: 'src/loops.rs', lines 223:0-227:27 -/
 def list_nth_mut_loop_pair_merge_back
   (T : Type) (ls0 : List T) (ls1 : List T) (i : U32) (ret0 : (T × T)) :
   Result ((List T) × (List T))
   :=
   list_nth_mut_loop_pair_merge_loop_back T ls0 ls1 i ret0
 
-/- [loops::list_nth_shared_loop_pair_merge]: loop 0: forward function -/
+/- [loops::list_nth_shared_loop_pair_merge]: loop 0: forward function
+   Source: 'src/loops.rs', lines 241:0-256:1 -/
 divergent def list_nth_shared_loop_pair_merge_loop
   (T : Type) (ls0 : List T) (ls1 : List T) (i : U32) : Result (T × T) :=
   match ls0 with
@@ -429,12 +471,14 @@ divergent def list_nth_shared_loop_pair_merge_loop
     | List.Nil => Result.fail Error.panic
   | List.Nil => Result.fail Error.panic
 
-/- [loops::list_nth_shared_loop_pair_merge]: forward function -/
+/- [loops::list_nth_shared_loop_pair_merge]: forward function
+   Source: 'src/loops.rs', lines 241:0-245:19 -/
 def list_nth_shared_loop_pair_merge
   (T : Type) (ls0 : List T) (ls1 : List T) (i : U32) : Result (T × T) :=
   list_nth_shared_loop_pair_merge_loop T ls0 ls1 i
 
-/- [loops::list_nth_mut_shared_loop_pair]: loop 0: forward function -/
+/- [loops::list_nth_mut_shared_loop_pair]: loop 0: forward function
+   Source: 'src/loops.rs', lines 259:0-274:1 -/
 divergent def list_nth_mut_shared_loop_pair_loop
   (T : Type) (ls0 : List T) (ls1 : List T) (i : U32) : Result (T × T) :=
   match ls0 with
@@ -450,12 +494,14 @@ divergent def list_nth_mut_shared_loop_pair_loop
     | List.Nil => Result.fail Error.panic
   | List.Nil => Result.fail Error.panic
 
-/- [loops::list_nth_mut_shared_loop_pair]: forward function -/
+/- [loops::list_nth_mut_shared_loop_pair]: forward function
+   Source: 'src/loops.rs', lines 259:0-263:23 -/
 def list_nth_mut_shared_loop_pair
   (T : Type) (ls0 : List T) (ls1 : List T) (i : U32) : Result (T × T) :=
   list_nth_mut_shared_loop_pair_loop T ls0 ls1 i
 
-/- [loops::list_nth_mut_shared_loop_pair]: loop 0: backward function 0 -/
+/- [loops::list_nth_mut_shared_loop_pair]: loop 0: backward function 0
+   Source: 'src/loops.rs', lines 259:0-274:1 -/
 divergent def list_nth_mut_shared_loop_pair_loop_back
   (T : Type) (ls0 : List T) (ls1 : List T) (i : U32) (ret0 : T) :
   Result (List T)
@@ -475,14 +521,16 @@ divergent def list_nth_mut_shared_loop_pair_loop_back
     | List.Nil => Result.fail Error.panic
   | List.Nil => Result.fail Error.panic
 
-/- [loops::list_nth_mut_shared_loop_pair]: backward function 0 -/
+/- [loops::list_nth_mut_shared_loop_pair]: backward function 0
+   Source: 'src/loops.rs', lines 259:0-263:23 -/
 def list_nth_mut_shared_loop_pair_back
   (T : Type) (ls0 : List T) (ls1 : List T) (i : U32) (ret0 : T) :
   Result (List T)
   :=
   list_nth_mut_shared_loop_pair_loop_back T ls0 ls1 i ret0
 
-/- [loops::list_nth_mut_shared_loop_pair_merge]: loop 0: forward function -/
+/- [loops::list_nth_mut_shared_loop_pair_merge]: loop 0: forward function
+   Source: 'src/loops.rs', lines 278:0-293:1 -/
 divergent def list_nth_mut_shared_loop_pair_merge_loop
   (T : Type) (ls0 : List T) (ls1 : List T) (i : U32) : Result (T × T) :=
   match ls0 with
@@ -498,12 +546,14 @@ divergent def list_nth_mut_shared_loop_pair_merge_loop
     | List.Nil => Result.fail Error.panic
   | List.Nil => Result.fail Error.panic
 
-/- [loops::list_nth_mut_shared_loop_pair_merge]: forward function -/
+/- [loops::list_nth_mut_shared_loop_pair_merge]: forward function
+   Source: 'src/loops.rs', lines 278:0-282:23 -/
 def list_nth_mut_shared_loop_pair_merge
   (T : Type) (ls0 : List T) (ls1 : List T) (i : U32) : Result (T × T) :=
   list_nth_mut_shared_loop_pair_merge_loop T ls0 ls1 i
 
-/- [loops::list_nth_mut_shared_loop_pair_merge]: loop 0: backward function 0 -/
+/- [loops::list_nth_mut_shared_loop_pair_merge]: loop 0: backward function 0
+   Source: 'src/loops.rs', lines 278:0-293:1 -/
 divergent def list_nth_mut_shared_loop_pair_merge_loop_back
   (T : Type) (ls0 : List T) (ls1 : List T) (i : U32) (ret0 : T) :
   Result (List T)
@@ -523,14 +573,16 @@ divergent def list_nth_mut_shared_loop_pair_merge_loop_back
     | List.Nil => Result.fail Error.panic
   | List.Nil => Result.fail Error.panic
 
-/- [loops::list_nth_mut_shared_loop_pair_merge]: backward function 0 -/
+/- [loops::list_nth_mut_shared_loop_pair_merge]: backward function 0
+   Source: 'src/loops.rs', lines 278:0-282:23 -/
 def list_nth_mut_shared_loop_pair_merge_back
   (T : Type) (ls0 : List T) (ls1 : List T) (i : U32) (ret0 : T) :
   Result (List T)
   :=
   list_nth_mut_shared_loop_pair_merge_loop_back T ls0 ls1 i ret0
 
-/- [loops::list_nth_shared_mut_loop_pair]: loop 0: forward function -/
+/- [loops::list_nth_shared_mut_loop_pair]: loop 0: forward function
+   Source: 'src/loops.rs', lines 297:0-312:1 -/
 divergent def list_nth_shared_mut_loop_pair_loop
   (T : Type) (ls0 : List T) (ls1 : List T) (i : U32) : Result (T × T) :=
   match ls0 with
@@ -546,12 +598,14 @@ divergent def list_nth_shared_mut_loop_pair_loop
     | List.Nil => Result.fail Error.panic
   | List.Nil => Result.fail Error.panic
 
-/- [loops::list_nth_shared_mut_loop_pair]: forward function -/
+/- [loops::list_nth_shared_mut_loop_pair]: forward function
+   Source: 'src/loops.rs', lines 297:0-301:23 -/
 def list_nth_shared_mut_loop_pair
   (T : Type) (ls0 : List T) (ls1 : List T) (i : U32) : Result (T × T) :=
   list_nth_shared_mut_loop_pair_loop T ls0 ls1 i
 
-/- [loops::list_nth_shared_mut_loop_pair]: loop 0: backward function 1 -/
+/- [loops::list_nth_shared_mut_loop_pair]: loop 0: backward function 1
+   Source: 'src/loops.rs', lines 297:0-312:1 -/
 divergent def list_nth_shared_mut_loop_pair_loop_back
   (T : Type) (ls0 : List T) (ls1 : List T) (i : U32) (ret0 : T) :
   Result (List T)
@@ -571,14 +625,16 @@ divergent def list_nth_shared_mut_loop_pair_loop_back
     | List.Nil => Result.fail Error.panic
   | List.Nil => Result.fail Error.panic
 
-/- [loops::list_nth_shared_mut_loop_pair]: backward function 1 -/
+/- [loops::list_nth_shared_mut_loop_pair]: backward function 1
+   Source: 'src/loops.rs', lines 297:0-301:23 -/
 def list_nth_shared_mut_loop_pair_back
   (T : Type) (ls0 : List T) (ls1 : List T) (i : U32) (ret0 : T) :
   Result (List T)
   :=
   list_nth_shared_mut_loop_pair_loop_back T ls0 ls1 i ret0
 
-/- [loops::list_nth_shared_mut_loop_pair_merge]: loop 0: forward function -/
+/- [loops::list_nth_shared_mut_loop_pair_merge]: loop 0: forward function
+   Source: 'src/loops.rs', lines 316:0-331:1 -/
 divergent def list_nth_shared_mut_loop_pair_merge_loop
   (T : Type) (ls0 : List T) (ls1 : List T) (i : U32) : Result (T × T) :=
   match ls0 with
@@ -594,12 +650,14 @@ divergent def list_nth_shared_mut_loop_pair_merge_loop
     | List.Nil => Result.fail Error.panic
   | List.Nil => Result.fail Error.panic
 
-/- [loops::list_nth_shared_mut_loop_pair_merge]: forward function -/
+/- [loops::list_nth_shared_mut_loop_pair_merge]: forward function
+   Source: 'src/loops.rs', lines 316:0-320:23 -/
 def list_nth_shared_mut_loop_pair_merge
   (T : Type) (ls0 : List T) (ls1 : List T) (i : U32) : Result (T × T) :=
   list_nth_shared_mut_loop_pair_merge_loop T ls0 ls1 i
 
-/- [loops::list_nth_shared_mut_loop_pair_merge]: loop 0: backward function 0 -/
+/- [loops::list_nth_shared_mut_loop_pair_merge]: loop 0: backward function 0
+   Source: 'src/loops.rs', lines 316:0-331:1 -/
 divergent def list_nth_shared_mut_loop_pair_merge_loop_back
   (T : Type) (ls0 : List T) (ls1 : List T) (i : U32) (ret0 : T) :
   Result (List T)
@@ -619,7 +677,8 @@ divergent def list_nth_shared_mut_loop_pair_merge_loop_back
     | List.Nil => Result.fail Error.panic
   | List.Nil => Result.fail Error.panic
 
-/- [loops::list_nth_shared_mut_loop_pair_merge]: backward function 0 -/
+/- [loops::list_nth_shared_mut_loop_pair_merge]: backward function 0
+   Source: 'src/loops.rs', lines 316:0-320:23 -/
 def list_nth_shared_mut_loop_pair_merge_back
   (T : Type) (ls0 : List T) (ls1 : List T) (i : U32) (ret0 : T) :
   Result (List T)
diff --git a/tests/lean/NoNestedBorrows.lean b/tests/lean/NoNestedBorrows.lean
index c4a6a265..3b1c3f9f 100644
--- a/tests/lean/NoNestedBorrows.lean
+++ b/tests/lean/NoNestedBorrows.lean
@@ -5,78 +5,96 @@ open Primitives
 
 namespace no_nested_borrows
 
-/- [no_nested_borrows::Pair] -/
+/- [no_nested_borrows::Pair]
+   Source: 'src/no_nested_borrows.rs', lines 4:0-4:23 -/
 structure Pair (T1 T2 : Type) where
   x : T1
   y : T2
 
-/- [no_nested_borrows::List] -/
+/- [no_nested_borrows::List]
+   Source: 'src/no_nested_borrows.rs', lines 9:0-9:16 -/
 inductive List (T : Type) :=
 | Cons : T → List T → List T
 | Nil : List T
 
-/- [no_nested_borrows::One] -/
+/- [no_nested_borrows::One]
+   Source: 'src/no_nested_borrows.rs', lines 20:0-20:16 -/
 inductive One (T1 : Type) :=
 | One : T1 → One T1
 
-/- [no_nested_borrows::EmptyEnum] -/
+/- [no_nested_borrows::EmptyEnum]
+   Source: 'src/no_nested_borrows.rs', lines 26:0-26:18 -/
 inductive EmptyEnum :=
 | Empty : EmptyEnum
 
-/- [no_nested_borrows::Enum] -/
+/- [no_nested_borrows::Enum]
+   Source: 'src/no_nested_borrows.rs', lines 32:0-32:13 -/
 inductive Enum :=
 | Variant1 : Enum
 | Variant2 : Enum
 
-/- [no_nested_borrows::EmptyStruct] -/
+/- [no_nested_borrows::EmptyStruct]
+   Source: 'src/no_nested_borrows.rs', lines 39:0-39:22 -/
 structure EmptyStruct where
 
-/- [no_nested_borrows::Sum] -/
+/- [no_nested_borrows::Sum]
+   Source: 'src/no_nested_borrows.rs', lines 41:0-41:20 -/
 inductive Sum (T1 T2 : Type) :=
 | Left : T1 → Sum T1 T2
 | Right : T2 → Sum T1 T2
 
-/- [no_nested_borrows::neg_test]: forward function -/
+/- [no_nested_borrows::neg_test]: forward function
+   Source: 'src/no_nested_borrows.rs', lines 48:0-48:30 -/
 def neg_test (x : I32) : Result I32 :=
   - x
 
-/- [no_nested_borrows::add_test]: forward function -/
+/- [no_nested_borrows::add_test]: forward function
+   Source: 'src/no_nested_borrows.rs', lines 54:0-54:38 -/
 def add_test (x : U32) (y : U32) : Result U32 :=
   x + y
 
-/- [no_nested_borrows::subs_test]: forward function -/
+/- [no_nested_borrows::subs_test]: forward function
+   Source: 'src/no_nested_borrows.rs', lines 60:0-60:39 -/
 def subs_test (x : U32) (y : U32) : Result U32 :=
   x - y
 
-/- [no_nested_borrows::div_test]: forward function -/
+/- [no_nested_borrows::div_test]: forward function
+   Source: 'src/no_nested_borrows.rs', lines 66:0-66:38 -/
 def div_test (x : U32) (y : U32) : Result U32 :=
   x / y
 
-/- [no_nested_borrows::div_test1]: forward function -/
+/- [no_nested_borrows::div_test1]: forward function
+   Source: 'src/no_nested_borrows.rs', lines 73:0-73:31 -/
 def div_test1 (x : U32) : Result U32 :=
   x / 2#u32
 
-/- [no_nested_borrows::rem_test]: forward function -/
+/- [no_nested_borrows::rem_test]: forward function
+   Source: 'src/no_nested_borrows.rs', lines 78:0-78:38 -/
 def rem_test (x : U32) (y : U32) : Result U32 :=
   x % y
 
-/- [no_nested_borrows::mul_test]: forward function -/
+/- [no_nested_borrows::mul_test]: forward function
+   Source: 'src/no_nested_borrows.rs', lines 82:0-82:38 -/
 def mul_test (x : U32) (y : U32) : Result U32 :=
   x * y
 
-/- [no_nested_borrows::CONST0] -/
+/- [no_nested_borrows::CONST0]
+   Source: 'src/no_nested_borrows.rs', lines 91:0-91:23 -/
 def const0_body : Result Usize := 1#usize + 1#usize
 def const0_c : Usize := eval_global const0_body (by simp)
 
-/- [no_nested_borrows::CONST1] -/
+/- [no_nested_borrows::CONST1]
+   Source: 'src/no_nested_borrows.rs', lines 92:0-92:23 -/
 def const1_body : Result Usize := 2#usize * 2#usize
 def const1_c : Usize := eval_global const1_body (by simp)
 
-/- [no_nested_borrows::cast_test]: forward function -/
+/- [no_nested_borrows::cast_test]: forward function
+   Source: 'src/no_nested_borrows.rs', lines 94:0-94:31 -/
 def cast_test (x : U32) : Result I32 :=
   Scalar.cast .I32 x
 
-/- [no_nested_borrows::test2]: forward function -/
+/- [no_nested_borrows::test2]: forward function
+   Source: 'src/no_nested_borrows.rs', lines 99:0-99:14 -/
 def test2 : Result Unit :=
   do
     let _ ← 23#u32 + 44#u32
@@ -85,13 +103,15 @@ def test2 : Result Unit :=
 /- Unit test for [no_nested_borrows::test2] -/
 #assert (test2 == .ret ())
 
-/- [no_nested_borrows::get_max]: forward function -/
+/- [no_nested_borrows::get_max]: forward function
+   Source: 'src/no_nested_borrows.rs', lines 111:0-111:37 -/
 def get_max (x : U32) (y : U32) : Result U32 :=
   if x >= y
   then Result.ret x
   else Result.ret y
 
-/- [no_nested_borrows::test3]: forward function -/
+/- [no_nested_borrows::test3]: forward function
+   Source: 'src/no_nested_borrows.rs', lines 119:0-119:14 -/
 def test3 : Result Unit :=
   do
     let x ← get_max 4#u32 3#u32
@@ -104,7 +124,8 @@ def test3 : Result Unit :=
 /- Unit test for [no_nested_borrows::test3] -/
 #assert (test3 == .ret ())
 
-/- [no_nested_borrows::test_neg1]: forward function -/
+/- [no_nested_borrows::test_neg1]: forward function
+   Source: 'src/no_nested_borrows.rs', lines 126:0-126:18 -/
 def test_neg1 : Result Unit :=
   do
     let y ← - 3#i32
@@ -115,7 +136,8 @@ def test_neg1 : Result Unit :=
 /- Unit test for [no_nested_borrows::test_neg1] -/
 #assert (test_neg1 == .ret ())
 
-/- [no_nested_borrows::refs_test1]: forward function -/
+/- [no_nested_borrows::refs_test1]: forward function
+   Source: 'src/no_nested_borrows.rs', lines 133:0-133:19 -/
 def refs_test1 : Result Unit :=
   if not (1#i32 = 1#i32)
   then Result.fail Error.panic
@@ -124,7 +146,8 @@ def refs_test1 : Result Unit :=
 /- Unit test for [no_nested_borrows::refs_test1] -/
 #assert (refs_test1 == .ret ())
 
-/- [no_nested_borrows::refs_test2]: forward function -/
+/- [no_nested_borrows::refs_test2]: forward function
+   Source: 'src/no_nested_borrows.rs', lines 144:0-144:19 -/
 def refs_test2 : Result Unit :=
   if not (2#i32 = 2#i32)
   then Result.fail Error.panic
@@ -142,41 +165,49 @@ def refs_test2 : Result Unit :=
 /- Unit test for [no_nested_borrows::refs_test2] -/
 #assert (refs_test2 == .ret ())
 
-/- [no_nested_borrows::test_list1]: forward function -/
+/- [no_nested_borrows::test_list1]: forward function
+   Source: 'src/no_nested_borrows.rs', lines 160:0-160:19 -/
 def test_list1 : Result Unit :=
   Result.ret ()
 
 /- Unit test for [no_nested_borrows::test_list1] -/
 #assert (test_list1 == .ret ())
 
-/- [no_nested_borrows::test_box1]: forward function -/
+/- [no_nested_borrows::test_box1]: forward function
+   Source: 'src/no_nested_borrows.rs', lines 165:0-165:18 -/
 def test_box1 : Result Unit :=
-  let b := 1#i32
-  let x := b
-  if not (x = 1#i32)
-  then Result.fail Error.panic
-  else Result.ret ()
+  do
+    let b := 0#i32
+    let b0 ← alloc.boxed.Box.deref_mut_back I32 b 1#i32
+    let x ← alloc.boxed.Box.deref I32 b0
+    if not (x = 1#i32)
+    then Result.fail Error.panic
+    else Result.ret ()
 
 /- Unit test for [no_nested_borrows::test_box1] -/
 #assert (test_box1 == .ret ())
 
-/- [no_nested_borrows::copy_int]: forward function -/
+/- [no_nested_borrows::copy_int]: forward function
+   Source: 'src/no_nested_borrows.rs', lines 175:0-175:30 -/
 def copy_int (x : I32) : Result I32 :=
   Result.ret x
 
-/- [no_nested_borrows::test_unreachable]: forward function -/
+/- [no_nested_borrows::test_unreachable]: forward function
+   Source: 'src/no_nested_borrows.rs', lines 181:0-181:32 -/
 def test_unreachable (b : Bool) : Result Unit :=
   if b
   then Result.fail Error.panic
   else Result.ret ()
 
-/- [no_nested_borrows::test_panic]: forward function -/
+/- [no_nested_borrows::test_panic]: forward function
+   Source: 'src/no_nested_borrows.rs', lines 189:0-189:26 -/
 def test_panic (b : Bool) : Result Unit :=
   if b
   then Result.fail Error.panic
   else Result.ret ()
 
-/- [no_nested_borrows::test_copy_int]: forward function -/
+/- [no_nested_borrows::test_copy_int]: forward function
+   Source: 'src/no_nested_borrows.rs', lines 196:0-196:22 -/
 def test_copy_int : Result Unit :=
   do
     let y ← copy_int 0#i32
@@ -187,13 +218,15 @@ def test_copy_int : Result Unit :=
 /- Unit test for [no_nested_borrows::test_copy_int] -/
 #assert (test_copy_int == .ret ())
 
-/- [no_nested_borrows::is_cons]: forward function -/
+/- [no_nested_borrows::is_cons]: forward function
+   Source: 'src/no_nested_borrows.rs', lines 203:0-203:38 -/
 def is_cons (T : Type) (l : List T) : Result Bool :=
   match l with
   | List.Cons t l0 => Result.ret true
   | List.Nil => Result.ret false
 
-/- [no_nested_borrows::test_is_cons]: forward function -/
+/- [no_nested_borrows::test_is_cons]: forward function
+   Source: 'src/no_nested_borrows.rs', lines 210:0-210:21 -/
 def test_is_cons : Result Unit :=
   do
     let l := List.Nil
@@ -205,13 +238,15 @@ def test_is_cons : Result Unit :=
 /- Unit test for [no_nested_borrows::test_is_cons] -/
 #assert (test_is_cons == .ret ())
 
-/- [no_nested_borrows::split_list]: forward function -/
+/- [no_nested_borrows::split_list]: forward function
+   Source: 'src/no_nested_borrows.rs', lines 216:0-216:48 -/
 def split_list (T : Type) (l : List T) : Result (T × (List T)) :=
   match l with
   | List.Cons hd tl => Result.ret (hd, tl)
   | List.Nil => Result.fail Error.panic
 
-/- [no_nested_borrows::test_split_list]: forward function -/
+/- [no_nested_borrows::test_split_list]: forward function
+   Source: 'src/no_nested_borrows.rs', lines 224:0-224:24 -/
 def test_split_list : Result Unit :=
   do
     let l := List.Nil
@@ -224,20 +259,23 @@ def test_split_list : Result Unit :=
 /- Unit test for [no_nested_borrows::test_split_list] -/
 #assert (test_split_list == .ret ())
 
-/- [no_nested_borrows::choose]: forward function -/
+/- [no_nested_borrows::choose]: forward function
+   Source: 'src/no_nested_borrows.rs', lines 231:0-231:70 -/
 def choose (T : Type) (b : Bool) (x : T) (y : T) : Result T :=
   if b
   then Result.ret x
   else Result.ret y
 
-/- [no_nested_borrows::choose]: backward function 0 -/
+/- [no_nested_borrows::choose]: backward function 0
+   Source: 'src/no_nested_borrows.rs', lines 231:0-231:70 -/
 def choose_back
   (T : Type) (b : Bool) (x : T) (y : T) (ret0 : T) : Result (T × T) :=
   if b
   then Result.ret (ret0, y)
   else Result.ret (x, ret0)
 
-/- [no_nested_borrows::choose_test]: forward function -/
+/- [no_nested_borrows::choose_test]: forward function
+   Source: 'src/no_nested_borrows.rs', lines 239:0-239:20 -/
 def choose_test : Result Unit :=
   do
     let z ← choose I32 true 0#i32 0#i32
@@ -256,25 +294,29 @@ def choose_test : Result Unit :=
 /- Unit test for [no_nested_borrows::choose_test] -/
 #assert (choose_test == .ret ())
 
-/- [no_nested_borrows::test_char]: forward function -/
+/- [no_nested_borrows::test_char]: forward function
+   Source: 'src/no_nested_borrows.rs', lines 251:0-251:26 -/
 def test_char : Result Char :=
   Result.ret 'a'
 
 mutual
 
-/- [no_nested_borrows::Tree] -/
+/- [no_nested_borrows::Tree]
+   Source: 'src/no_nested_borrows.rs', lines 256:0-256:16 -/
 inductive Tree (T : Type) :=
 | Leaf : T → Tree T
 | Node : T → NodeElem T → Tree T → Tree T
 
-/- [no_nested_borrows::NodeElem] -/
+/- [no_nested_borrows::NodeElem]
+   Source: 'src/no_nested_borrows.rs', lines 261:0-261:20 -/
 inductive NodeElem (T : Type) :=
 | Cons : Tree T → NodeElem T → NodeElem T
 | Nil : NodeElem T
 
 end
 
-/- [no_nested_borrows::list_length]: forward function -/
+/- [no_nested_borrows::list_length]: forward function
+   Source: 'src/no_nested_borrows.rs', lines 296:0-296:48 -/
 divergent def list_length (T : Type) (l : List T) : Result U32 :=
   match l with
   | List.Cons t l1 => do
@@ -282,7 +324,8 @@ divergent def list_length (T : Type) (l : List T) : Result U32 :=
                         1#u32 + i
   | List.Nil => Result.ret 0#u32
 
-/- [no_nested_borrows::list_nth_shared]: forward function -/
+/- [no_nested_borrows::list_nth_shared]: forward function
+   Source: 'src/no_nested_borrows.rs', lines 304:0-304:62 -/
 divergent def list_nth_shared (T : Type) (l : List T) (i : U32) : Result T :=
   match l with
   | List.Cons x tl =>
@@ -293,7 +336,8 @@ divergent def list_nth_shared (T : Type) (l : List T) (i : U32) : Result T :=
            list_nth_shared T tl i0
   | List.Nil => Result.fail Error.panic
 
-/- [no_nested_borrows::list_nth_mut]: forward function -/
+/- [no_nested_borrows::list_nth_mut]: forward function
+   Source: 'src/no_nested_borrows.rs', lines 320:0-320:67 -/
 divergent def list_nth_mut (T : Type) (l : List T) (i : U32) : Result T :=
   match l with
   | List.Cons x tl =>
@@ -304,7 +348,8 @@ divergent def list_nth_mut (T : Type) (l : List T) (i : U32) : Result T :=
            list_nth_mut T tl i0
   | List.Nil => Result.fail Error.panic
 
-/- [no_nested_borrows::list_nth_mut]: backward function 0 -/
+/- [no_nested_borrows::list_nth_mut]: backward function 0
+   Source: 'src/no_nested_borrows.rs', lines 320:0-320:67 -/
 divergent def list_nth_mut_back
   (T : Type) (l : List T) (i : U32) (ret0 : T) : Result (List T) :=
   match l with
@@ -318,7 +363,8 @@ divergent def list_nth_mut_back
         Result.ret (List.Cons x tl0)
   | List.Nil => Result.fail Error.panic
 
-/- [no_nested_borrows::list_rev_aux]: forward function -/
+/- [no_nested_borrows::list_rev_aux]: forward function
+   Source: 'src/no_nested_borrows.rs', lines 336:0-336:63 -/
 divergent def list_rev_aux
   (T : Type) (li : List T) (lo : List T) : Result (List T) :=
   match li with
@@ -326,12 +372,14 @@ divergent def list_rev_aux
   | List.Nil => Result.ret lo
 
 /- [no_nested_borrows::list_rev]: merged forward/backward function
-   (there is a single backward function, and the forward function returns ()) -/
+   (there is a single backward function, and the forward function returns ())
+   Source: 'src/no_nested_borrows.rs', lines 350:0-350:42 -/
 def list_rev (T : Type) (l : List T) : Result (List T) :=
   let li := core.mem.replace (List T) l List.Nil
   list_rev_aux T li List.Nil
 
-/- [no_nested_borrows::test_list_functions]: forward function -/
+/- [no_nested_borrows::test_list_functions]: forward function
+   Source: 'src/no_nested_borrows.rs', lines 355:0-355:28 -/
 def test_list_functions : Result Unit :=
   do
     let l := List.Nil
@@ -377,81 +425,98 @@ def test_list_functions : Result Unit :=
 /- Unit test for [no_nested_borrows::test_list_functions] -/
 #assert (test_list_functions == .ret ())
 
-/- [no_nested_borrows::id_mut_pair1]: forward function -/
+/- [no_nested_borrows::id_mut_pair1]: forward function
+   Source: 'src/no_nested_borrows.rs', lines 371:0-371:89 -/
 def id_mut_pair1 (T1 T2 : Type) (x : T1) (y : T2) : Result (T1 × T2) :=
   Result.ret (x, y)
 
-/- [no_nested_borrows::id_mut_pair1]: backward function 0 -/
+/- [no_nested_borrows::id_mut_pair1]: backward function 0
+   Source: 'src/no_nested_borrows.rs', lines 371:0-371:89 -/
 def id_mut_pair1_back
   (T1 T2 : Type) (x : T1) (y : T2) (ret0 : (T1 × T2)) : Result (T1 × T2) :=
   let (t, t0) := ret0
   Result.ret (t, t0)
 
-/- [no_nested_borrows::id_mut_pair2]: forward function -/
+/- [no_nested_borrows::id_mut_pair2]: forward function
+   Source: 'src/no_nested_borrows.rs', lines 375:0-375:88 -/
 def id_mut_pair2 (T1 T2 : Type) (p : (T1 × T2)) : Result (T1 × T2) :=
   let (t, t0) := p
   Result.ret (t, t0)
 
-/- [no_nested_borrows::id_mut_pair2]: backward function 0 -/
+/- [no_nested_borrows::id_mut_pair2]: backward function 0
+   Source: 'src/no_nested_borrows.rs', lines 375:0-375:88 -/
 def id_mut_pair2_back
   (T1 T2 : Type) (p : (T1 × T2)) (ret0 : (T1 × T2)) : Result (T1 × T2) :=
   let (t, t0) := ret0
   Result.ret (t, t0)
 
-/- [no_nested_borrows::id_mut_pair3]: forward function -/
+/- [no_nested_borrows::id_mut_pair3]: forward function
+   Source: 'src/no_nested_borrows.rs', lines 379:0-379:93 -/
 def id_mut_pair3 (T1 T2 : Type) (x : T1) (y : T2) : Result (T1 × T2) :=
   Result.ret (x, y)
 
-/- [no_nested_borrows::id_mut_pair3]: backward function 0 -/
+/- [no_nested_borrows::id_mut_pair3]: backward function 0
+   Source: 'src/no_nested_borrows.rs', lines 379:0-379:93 -/
 def id_mut_pair3_back'a
   (T1 T2 : Type) (x : T1) (y : T2) (ret0 : T1) : Result T1 :=
   Result.ret ret0
 
-/- [no_nested_borrows::id_mut_pair3]: backward function 1 -/
+/- [no_nested_borrows::id_mut_pair3]: backward function 1
+   Source: 'src/no_nested_borrows.rs', lines 379:0-379:93 -/
 def id_mut_pair3_back'b
   (T1 T2 : Type) (x : T1) (y : T2) (ret0 : T2) : Result T2 :=
   Result.ret ret0
 
-/- [no_nested_borrows::id_mut_pair4]: forward function -/
+/- [no_nested_borrows::id_mut_pair4]: forward function
+   Source: 'src/no_nested_borrows.rs', lines 383:0-383:92 -/
 def id_mut_pair4 (T1 T2 : Type) (p : (T1 × T2)) : Result (T1 × T2) :=
   let (t, t0) := p
   Result.ret (t, t0)
 
-/- [no_nested_borrows::id_mut_pair4]: backward function 0 -/
+/- [no_nested_borrows::id_mut_pair4]: backward function 0
+   Source: 'src/no_nested_borrows.rs', lines 383:0-383:92 -/
 def id_mut_pair4_back'a
   (T1 T2 : Type) (p : (T1 × T2)) (ret0 : T1) : Result T1 :=
   Result.ret ret0
 
-/- [no_nested_borrows::id_mut_pair4]: backward function 1 -/
+/- [no_nested_borrows::id_mut_pair4]: backward function 1
+   Source: 'src/no_nested_borrows.rs', lines 383:0-383:92 -/
 def id_mut_pair4_back'b
   (T1 T2 : Type) (p : (T1 × T2)) (ret0 : T2) : Result T2 :=
   Result.ret ret0
 
-/- [no_nested_borrows::StructWithTuple] -/
+/- [no_nested_borrows::StructWithTuple]
+   Source: 'src/no_nested_borrows.rs', lines 390:0-390:34 -/
 structure StructWithTuple (T1 T2 : Type) where
   p : (T1 × T2)
 
-/- [no_nested_borrows::new_tuple1]: forward function -/
+/- [no_nested_borrows::new_tuple1]: forward function
+   Source: 'src/no_nested_borrows.rs', lines 394:0-394:48 -/
 def new_tuple1 : Result (StructWithTuple U32 U32) :=
   Result.ret { p := (1#u32, 2#u32) }
 
-/- [no_nested_borrows::new_tuple2]: forward function -/
+/- [no_nested_borrows::new_tuple2]: forward function
+   Source: 'src/no_nested_borrows.rs', lines 398:0-398:48 -/
 def new_tuple2 : Result (StructWithTuple I16 I16) :=
   Result.ret { p := (1#i16, 2#i16) }
 
-/- [no_nested_borrows::new_tuple3]: forward function -/
+/- [no_nested_borrows::new_tuple3]: forward function
+   Source: 'src/no_nested_borrows.rs', lines 402:0-402:48 -/
 def new_tuple3 : Result (StructWithTuple U64 I64) :=
   Result.ret { p := (1#u64, 2#i64) }
 
-/- [no_nested_borrows::StructWithPair] -/
+/- [no_nested_borrows::StructWithPair]
+   Source: 'src/no_nested_borrows.rs', lines 407:0-407:33 -/
 structure StructWithPair (T1 T2 : Type) where
   p : Pair T1 T2
 
-/- [no_nested_borrows::new_pair1]: forward function -/
+/- [no_nested_borrows::new_pair1]: forward function
+   Source: 'src/no_nested_borrows.rs', lines 411:0-411:46 -/
 def new_pair1 : Result (StructWithPair U32 U32) :=
   Result.ret { p := { x := 1#u32, y := 2#u32 } }
 
-/- [no_nested_borrows::test_constants]: forward function -/
+/- [no_nested_borrows::test_constants]: forward function
+   Source: 'src/no_nested_borrows.rs', lines 419:0-419:23 -/
 def test_constants : Result Unit :=
   do
     let swt ← new_tuple1
@@ -480,7 +545,8 @@ def test_constants : Result Unit :=
 /- Unit test for [no_nested_borrows::test_constants] -/
 #assert (test_constants == .ret ())
 
-/- [no_nested_borrows::test_weird_borrows1]: forward function -/
+/- [no_nested_borrows::test_weird_borrows1]: forward function
+   Source: 'src/no_nested_borrows.rs', lines 428:0-428:28 -/
 def test_weird_borrows1 : Result Unit :=
   Result.ret ()
 
@@ -488,30 +554,35 @@ def test_weird_borrows1 : Result Unit :=
 #assert (test_weird_borrows1 == .ret ())
 
 /- [no_nested_borrows::test_mem_replace]: merged forward/backward function
-   (there is a single backward function, and the forward function returns ()) -/
+   (there is a single backward function, and the forward function returns ())
+   Source: 'src/no_nested_borrows.rs', lines 438:0-438:37 -/
 def test_mem_replace (px : U32) : Result U32 :=
   let y := core.mem.replace U32 px 1#u32
   if not (y = 0#u32)
   then Result.fail Error.panic
   else Result.ret 2#u32
 
-/- [no_nested_borrows::test_shared_borrow_bool1]: forward function -/
+/- [no_nested_borrows::test_shared_borrow_bool1]: forward function
+   Source: 'src/no_nested_borrows.rs', lines 445:0-445:47 -/
 def test_shared_borrow_bool1 (b : Bool) : Result U32 :=
   if b
   then Result.ret 0#u32
   else Result.ret 1#u32
 
-/- [no_nested_borrows::test_shared_borrow_bool2]: forward function -/
+/- [no_nested_borrows::test_shared_borrow_bool2]: forward function
+   Source: 'src/no_nested_borrows.rs', lines 458:0-458:40 -/
 def test_shared_borrow_bool2 : Result U32 :=
   Result.ret 0#u32
 
-/- [no_nested_borrows::test_shared_borrow_enum1]: forward function -/
+/- [no_nested_borrows::test_shared_borrow_enum1]: forward function
+   Source: 'src/no_nested_borrows.rs', lines 473:0-473:52 -/
 def test_shared_borrow_enum1 (l : List U32) : Result U32 :=
   match l with
   | List.Cons i l0 => Result.ret 1#u32
   | List.Nil => Result.ret 0#u32
 
-/- [no_nested_borrows::test_shared_borrow_enum2]: forward function -/
+/- [no_nested_borrows::test_shared_borrow_enum2]: forward function
+   Source: 'src/no_nested_borrows.rs', lines 485:0-485:40 -/
 def test_shared_borrow_enum2 : Result U32 :=
   Result.ret 0#u32
 
diff --git a/tests/lean/Paper.lean b/tests/lean/Paper.lean
index ae4dd243..37e0e70e 100644
--- a/tests/lean/Paper.lean
+++ b/tests/lean/Paper.lean
@@ -6,11 +6,13 @@ open Primitives
 namespace paper
 
 /- [paper::ref_incr]: merged forward/backward function
-   (there is a single backward function, and the forward function returns ()) -/
+   (there is a single backward function, and the forward function returns ())
+   Source: 'src/paper.rs', lines 4:0-4:28 -/
 def ref_incr (x : I32) : Result I32 :=
   x + 1#i32
 
-/- [paper::test_incr]: forward function -/
+/- [paper::test_incr]: forward function
+   Source: 'src/paper.rs', lines 8:0-8:18 -/
 def test_incr : Result Unit :=
   do
     let x ← ref_incr 0#i32
@@ -21,20 +23,23 @@ def test_incr : Result Unit :=
 /- Unit test for [paper::test_incr] -/
 #assert (test_incr == .ret ())
 
-/- [paper::choose]: forward function -/
+/- [paper::choose]: forward function
+   Source: 'src/paper.rs', lines 15:0-15:70 -/
 def choose (T : Type) (b : Bool) (x : T) (y : T) : Result T :=
   if b
   then Result.ret x
   else Result.ret y
 
-/- [paper::choose]: backward function 0 -/
+/- [paper::choose]: backward function 0
+   Source: 'src/paper.rs', lines 15:0-15:70 -/
 def choose_back
   (T : Type) (b : Bool) (x : T) (y : T) (ret0 : T) : Result (T × T) :=
   if b
   then Result.ret (ret0, y)
   else Result.ret (x, ret0)
 
-/- [paper::test_choose]: forward function -/
+/- [paper::test_choose]: forward function
+   Source: 'src/paper.rs', lines 23:0-23:20 -/
 def test_choose : Result Unit :=
   do
     let z ← choose I32 true 0#i32 0#i32
@@ -53,12 +58,14 @@ def test_choose : Result Unit :=
 /- Unit test for [paper::test_choose] -/
 #assert (test_choose == .ret ())
 
-/- [paper::List] -/
+/- [paper::List]
+   Source: 'src/paper.rs', lines 35:0-35:16 -/
 inductive List (T : Type) :=
 | Cons : T → List T → List T
 | Nil : List T
 
-/- [paper::list_nth_mut]: forward function -/
+/- [paper::list_nth_mut]: forward function
+   Source: 'src/paper.rs', lines 42:0-42:67 -/
 divergent def list_nth_mut (T : Type) (l : List T) (i : U32) : Result T :=
   match l with
   | List.Cons x tl =>
@@ -69,7 +76,8 @@ divergent def list_nth_mut (T : Type) (l : List T) (i : U32) : Result T :=
            list_nth_mut T tl i0
   | List.Nil => Result.fail Error.panic
 
-/- [paper::list_nth_mut]: backward function 0 -/
+/- [paper::list_nth_mut]: backward function 0
+   Source: 'src/paper.rs', lines 42:0-42:67 -/
 divergent def list_nth_mut_back
   (T : Type) (l : List T) (i : U32) (ret0 : T) : Result (List T) :=
   match l with
@@ -83,7 +91,8 @@ divergent def list_nth_mut_back
         Result.ret (List.Cons x tl0)
   | List.Nil => Result.fail Error.panic
 
-/- [paper::sum]: forward function -/
+/- [paper::sum]: forward function
+   Source: 'src/paper.rs', lines 57:0-57:32 -/
 divergent def sum (l : List I32) : Result I32 :=
   match l with
   | List.Cons x tl => do
@@ -91,7 +100,8 @@ divergent def sum (l : List I32) : Result I32 :=
                         x + i
   | List.Nil => Result.ret 0#i32
 
-/- [paper::test_nth]: forward function -/
+/- [paper::test_nth]: forward function
+   Source: 'src/paper.rs', lines 68:0-68:17 -/
 def test_nth : Result Unit :=
   do
     let l := List.Nil
@@ -108,7 +118,8 @@ def test_nth : Result Unit :=
 /- Unit test for [paper::test_nth] -/
 #assert (test_nth == .ret ())
 
-/- [paper::call_choose]: forward function -/
+/- [paper::call_choose]: forward function
+   Source: 'src/paper.rs', lines 76:0-76:44 -/
 def call_choose (p : (U32 × U32)) : Result U32 :=
   do
     let (px, py) := p
diff --git a/tests/lean/PoloniusList.lean b/tests/lean/PoloniusList.lean
index 07f206a8..0ef71791 100644
--- a/tests/lean/PoloniusList.lean
+++ b/tests/lean/PoloniusList.lean
@@ -5,12 +5,14 @@ open Primitives
 
 namespace polonius_list
 
-/- [polonius_list::List] -/
+/- [polonius_list::List]
+   Source: 'src/polonius_list.rs', lines 3:0-3:16 -/
 inductive List (T : Type) :=
 | Cons : T → List T → List T
 | Nil : List T
 
-/- [polonius_list::get_list_at_x]: forward function -/
+/- [polonius_list::get_list_at_x]: forward function
+   Source: 'src/polonius_list.rs', lines 13:0-13:76 -/
 divergent def get_list_at_x (ls : List U32) (x : U32) : Result (List U32) :=
   match ls with
   | List.Cons hd tl =>
@@ -19,7 +21,8 @@ divergent def get_list_at_x (ls : List U32) (x : U32) : Result (List U32) :=
     else get_list_at_x tl x
   | List.Nil => Result.ret List.Nil
 
-/- [polonius_list::get_list_at_x]: backward function 0 -/
+/- [polonius_list::get_list_at_x]: backward function 0
+   Source: 'src/polonius_list.rs', lines 13:0-13:76 -/
 divergent def get_list_at_x_back
   (ls : List U32) (x : U32) (ret0 : List U32) : Result (List U32) :=
   match ls with
diff --git a/tests/lean/Traits.lean b/tests/lean/Traits.lean
index 12e7eafa..9ac4736c 100644
--- a/tests/lean/Traits.lean
+++ b/tests/lean/Traits.lean
@@ -5,204 +5,257 @@ open Primitives
 
 namespace traits
 
-/- Trait declaration: [traits::BoolTrait] -/
+/- Trait declaration: [traits::BoolTrait]
+   Source: 'src/traits.rs', lines 1:0-1:19 -/
 structure BoolTrait (Self : Type) where
   get_bool : Self → Result Bool
 
-/- [traits::Bool::{0}::get_bool]: forward function -/
+/- [traits::{bool}::get_bool]: forward function
+   Source: 'src/traits.rs', lines 12:4-12:30 -/
 def Bool.get_bool (self : Bool) : Result Bool :=
   Result.ret self
 
-/- Trait implementation: [traits::Bool::{0}] -/
-def Bool.BoolTraitInst : BoolTrait Bool := {
+/- Trait implementation: [traits::{bool}]
+   Source: 'src/traits.rs', lines 11:0-11:23 -/
+def traits.BoolTraitBoolInst : BoolTrait Bool := {
   get_bool := Bool.get_bool
 }
 
-/- [traits::BoolTrait::ret_true]: forward function -/
+/- [traits::BoolTrait::ret_true]: forward function
+   Source: 'src/traits.rs', lines 6:4-6:30 -/
 def BoolTrait.ret_true
   {Self : Type} (self_clause : BoolTrait Self) (self : Self) : Result Bool :=
   Result.ret true
 
-/- [traits::test_bool_trait_bool]: forward function -/
+/- [traits::test_bool_trait_bool]: forward function
+   Source: 'src/traits.rs', lines 17:0-17:44 -/
 def test_bool_trait_bool (x : Bool) : Result Bool :=
   do
     let b ← Bool.get_bool x
     if b
-    then BoolTrait.ret_true Bool.BoolTraitInst x
+    then BoolTrait.ret_true traits.BoolTraitBoolInst x
     else Result.ret false
 
-/- [traits::Option::{1}::get_bool]: forward function -/
+/- [traits::{core::option::Option<T>#1}::get_bool]: forward function
+   Source: 'src/traits.rs', lines 23:4-23:30 -/
 def Option.get_bool (T : Type) (self : Option T) : Result Bool :=
   match self with
   | none => Result.ret false
   | some t => Result.ret true
 
-/- Trait implementation: [traits::Option::{1}] -/
-def Option.BoolTraitInst (T : Type) : BoolTrait (Option T) := {
+/- Trait implementation: [traits::{core::option::Option<T>#1}]
+   Source: 'src/traits.rs', lines 22:0-22:31 -/
+def traits.BoolTraitcoreoptionOptionTInst (T : Type) : BoolTrait (Option T)
+  := {
   get_bool := Option.get_bool T
 }
 
-/- [traits::test_bool_trait_option]: forward function -/
+/- [traits::test_bool_trait_option]: forward function
+   Source: 'src/traits.rs', lines 31:0-31:54 -/
 def test_bool_trait_option (T : Type) (x : Option T) : Result Bool :=
   do
     let b ← Option.get_bool T x
     if b
-    then BoolTrait.ret_true (Option.BoolTraitInst T) x
+    then BoolTrait.ret_true (traits.BoolTraitcoreoptionOptionTInst T) x
     else Result.ret false
 
-/- [traits::test_bool_trait]: forward function -/
-def test_bool_trait (T : Type) (inst : BoolTrait T) (x : T) : Result Bool :=
-  inst.get_bool x
+/- [traits::test_bool_trait]: forward function
+   Source: 'src/traits.rs', lines 35:0-35:50 -/
+def test_bool_trait
+  (T : Type) (BoolTraitTInst : BoolTrait T) (x : T) : Result Bool :=
+  BoolTraitTInst.get_bool x
 
-/- Trait declaration: [traits::ToU64] -/
+/- Trait declaration: [traits::ToU64]
+   Source: 'src/traits.rs', lines 39:0-39:15 -/
 structure ToU64 (Self : Type) where
   to_u64 : Self → Result U64
 
-/- [traits::u64::{2}::to_u64]: forward function -/
-def u64.to_u64 (self : U64) : Result U64 :=
+/- [traits::{u64#2}::to_u64]: forward function
+   Source: 'src/traits.rs', lines 44:4-44:26 -/
+def U64.to_u64 (self : U64) : Result U64 :=
   Result.ret self
 
-/- Trait implementation: [traits::u64::{2}] -/
-def u64.ToU64Inst : ToU64 U64 := {
-  to_u64 := u64.to_u64
+/- Trait implementation: [traits::{u64#2}]
+   Source: 'src/traits.rs', lines 43:0-43:18 -/
+def traits.ToU64U64Inst : ToU64 U64 := {
+  to_u64 := U64.to_u64
 }
 
-/- [traits::Tuple2::{3}::to_u64]: forward function -/
-def Tuple2.to_u64 (A : Type) (inst : ToU64 A) (self : (A × A)) : Result U64 :=
+/- [traits::{(A, A)#3}::to_u64]: forward function
+   Source: 'src/traits.rs', lines 50:4-50:26 -/
+def Pair.to_u64
+  (A : Type) (ToU64AInst : ToU64 A) (self : (A × A)) : Result U64 :=
   do
     let (t, t0) := self
-    let i ← inst.to_u64 t
-    let i0 ← inst.to_u64 t0
+    let i ← ToU64AInst.to_u64 t
+    let i0 ← ToU64AInst.to_u64 t0
     i + i0
 
-/- Trait implementation: [traits::Tuple2::{3}] -/
-def Tuple2.ToU64Inst (A : Type) (inst : ToU64 A) : ToU64 (A × A) := {
-  to_u64 := Tuple2.to_u64 A inst
+/- Trait implementation: [traits::{(A, A)#3}]
+   Source: 'src/traits.rs', lines 49:0-49:31 -/
+def traits.ToU64TupleAAInst (A : Type) (ToU64AInst : ToU64 A) : ToU64 (A × A)
+  := {
+  to_u64 := Pair.to_u64 A ToU64AInst
 }
 
-/- [traits::f]: forward function -/
-def f (T : Type) (inst : ToU64 T) (x : (T × T)) : Result U64 :=
-  Tuple2.to_u64 T inst x
+/- [traits::f]: forward function
+   Source: 'src/traits.rs', lines 55:0-55:36 -/
+def f (T : Type) (ToU64TInst : ToU64 T) (x : (T × T)) : Result U64 :=
+  Pair.to_u64 T ToU64TInst x
 
-/- [traits::g]: forward function -/
-def g (T : Type) (inst : ToU64 (T × T)) (x : (T × T)) : Result U64 :=
-  inst.to_u64 x
+/- [traits::g]: forward function
+   Source: 'src/traits.rs', lines 59:0-61:18 -/
+def g
+  (T : Type) (ToU64TupleTTInst : ToU64 (T × T)) (x : (T × T)) : Result U64 :=
+  ToU64TupleTTInst.to_u64 x
 
-/- [traits::h0]: forward function -/
+/- [traits::h0]: forward function
+   Source: 'src/traits.rs', lines 66:0-66:24 -/
 def h0 (x : U64) : Result U64 :=
-  u64.to_u64 x
+  U64.to_u64 x
 
-/- [traits::Wrapper] -/
+/- [traits::Wrapper]
+   Source: 'src/traits.rs', lines 70:0-70:21 -/
 structure Wrapper (T : Type) where
   x : T
 
-/- [traits::Wrapper::{4}::to_u64]: forward function -/
+/- [traits::{traits::Wrapper<T>#4}::to_u64]: forward function
+   Source: 'src/traits.rs', lines 75:4-75:26 -/
 def Wrapper.to_u64
-  (T : Type) (inst : ToU64 T) (self : Wrapper T) : Result U64 :=
-  inst.to_u64 self.x
-
-/- Trait implementation: [traits::Wrapper::{4}] -/
-def Wrapper.ToU64Inst (T : Type) (inst : ToU64 T) : ToU64 (Wrapper T) := {
-  to_u64 := Wrapper.to_u64 T inst
+  (T : Type) (ToU64TInst : ToU64 T) (self : Wrapper T) : Result U64 :=
+  ToU64TInst.to_u64 self.x
+
+/- Trait implementation: [traits::{traits::Wrapper<T>#4}]
+   Source: 'src/traits.rs', lines 74:0-74:35 -/
+def traits.ToU64traitsWrapperTInst (T : Type) (ToU64TInst : ToU64 T) : ToU64
+  (Wrapper T) := {
+  to_u64 := Wrapper.to_u64 T ToU64TInst
 }
 
-/- [traits::h1]: forward function -/
+/- [traits::h1]: forward function
+   Source: 'src/traits.rs', lines 80:0-80:33 -/
 def h1 (x : Wrapper U64) : Result U64 :=
-  Wrapper.to_u64 U64 u64.ToU64Inst x
+  Wrapper.to_u64 U64 traits.ToU64U64Inst x
 
-/- [traits::h2]: forward function -/
-def h2 (T : Type) (inst : ToU64 T) (x : Wrapper T) : Result U64 :=
-  Wrapper.to_u64 T inst x
+/- [traits::h2]: forward function
+   Source: 'src/traits.rs', lines 84:0-84:41 -/
+def h2 (T : Type) (ToU64TInst : ToU64 T) (x : Wrapper T) : Result U64 :=
+  Wrapper.to_u64 T ToU64TInst x
 
-/- Trait declaration: [traits::ToType] -/
+/- Trait declaration: [traits::ToType]
+   Source: 'src/traits.rs', lines 88:0-88:19 -/
 structure ToType (Self T : Type) where
   to_type : Self → Result T
 
-/- [traits::u64::{5}::to_type]: forward function -/
-def u64.to_type (self : U64) : Result Bool :=
+/- [traits::{u64#5}::to_type]: forward function
+   Source: 'src/traits.rs', lines 93:4-93:28 -/
+def U64.to_type (self : U64) : Result Bool :=
   Result.ret (self > 0#u64)
 
-/- Trait implementation: [traits::u64::{5}] -/
-def u64.ToTypeInst : ToType U64 Bool := {
-  to_type := u64.to_type
+/- Trait implementation: [traits::{u64#5}]
+   Source: 'src/traits.rs', lines 92:0-92:25 -/
+def traits.ToTypeU64BoolInst : ToType U64 Bool := {
+  to_type := U64.to_type
 }
 
-/- Trait declaration: [traits::OfType] -/
+/- Trait declaration: [traits::OfType]
+   Source: 'src/traits.rs', lines 98:0-98:16 -/
 structure OfType (Self : Type) where
-  of_type : forall (T : Type) (inst : ToType T Self), T → Result Self
+  of_type : forall (T : Type) (ToTypeTSelfInst : ToType T Self), T → Result
+    Self
 
-/- [traits::h3]: forward function -/
+/- [traits::h3]: forward function
+   Source: 'src/traits.rs', lines 104:0-104:50 -/
 def h3
-  (T1 T2 : Type) (inst : OfType T1) (inst0 : ToType T2 T1) (y : T2) :
+  (T1 T2 : Type) (OfTypeT1Inst : OfType T1) (ToTypeT2T1Inst : ToType T2 T1)
+  (y : T2) :
   Result T1
   :=
-  inst.of_type T2 inst0 y
+  OfTypeT1Inst.of_type T2 ToTypeT2T1Inst y
 
-/- Trait declaration: [traits::OfTypeBis] -/
+/- Trait declaration: [traits::OfTypeBis]
+   Source: 'src/traits.rs', lines 109:0-109:36 -/
 structure OfTypeBis (Self T : Type) where
-  parent_clause_0 : ToType T Self
+  ToTypeTSelfInst : ToType T Self
   of_type : T → Result Self
 
-/- [traits::h4]: forward function -/
+/- [traits::h4]: forward function
+   Source: 'src/traits.rs', lines 118:0-118:57 -/
 def h4
-  (T1 T2 : Type) (inst : OfTypeBis T1 T2) (inst0 : ToType T2 T1) (y : T2) :
+  (T1 T2 : Type) (OfTypeBisT1T2Inst : OfTypeBis T1 T2) (ToTypeT2T1Inst : ToType
+  T2 T1) (y : T2) :
   Result T1
   :=
-  inst.of_type y
+  OfTypeBisT1T2Inst.of_type y
 
-/- [traits::TestType] -/
+/- [traits::TestType]
+   Source: 'src/traits.rs', lines 122:0-122:22 -/
 structure TestType (T : Type) where
   _0 : T
 
-/- [traits::TestType::{6}::test::TestType1] -/
+/- [traits::{traits::TestType<T>#6}::test::TestType1]
+   Source: 'src/traits.rs', lines 127:8-127:24 -/
 structure TestType.test.TestType1 where
   _0 : U64
 
-/- Trait declaration: [traits::TestType::{6}::test::TestTrait] -/
+/- Trait declaration: [traits::{traits::TestType<T>#6}::test::TestTrait]
+   Source: 'src/traits.rs', lines 128:8-128:23 -/
 structure TestType.test.TestTrait (Self : Type) where
   test : Self → Result Bool
 
-/- [traits::TestType::{6}::test::TestType1::{0}::test]: forward function -/
+/- [traits::{traits::TestType<T>#6}::test::{traits::{traits::TestType<T>#6}::test::TestType1}::test]: forward function
+   Source: 'src/traits.rs', lines 139:12-139:34 -/
 def TestType.test.TestType1.test
   (self : TestType.test.TestType1) : Result Bool :=
   Result.ret (self._0 > 1#u64)
 
-/- Trait implementation: [traits::TestType::{6}::test::TestType1::{0}] -/
-def TestType.test.TestType1.TestTypetestTestTraitInst : TestType.test.TestTrait
-  TestType.test.TestType1 := {
+/- Trait implementation: [traits::{traits::TestType<T>#6}::test::{traits::{traits::TestType<T>#6}::test::TestType1}]
+   Source: 'src/traits.rs', lines 138:8-138:36 -/
+def traits.TestType.test.TestTraittraitstraitsTestTypeTtestTestType1Inst :
+  TestType.test.TestTrait TestType.test.TestType1 := {
   test := TestType.test.TestType1.test
 }
 
-/- [traits::TestType::{6}::test]: forward function -/
+/- [traits::{traits::TestType<T>#6}::test]: forward function
+   Source: 'src/traits.rs', lines 126:4-126:36 -/
 def TestType.test
-  (T : Type) (inst : ToU64 T) (self : TestType T) (x : T) : Result Bool :=
+  (T : Type) (ToU64TInst : ToU64 T) (self : TestType T) (x : T) :
+  Result Bool
+  :=
   do
-    let x0 ← inst.to_u64 x
+    let x0 ← ToU64TInst.to_u64 x
     if x0 > 0#u64
     then TestType.test.TestType1.test { _0 := 0#u64 }
     else Result.ret false
 
-/- [traits::BoolWrapper] -/
+/- [traits::BoolWrapper]
+   Source: 'src/traits.rs', lines 150:0-150:22 -/
 structure BoolWrapper where
   _0 : Bool
 
-/- [traits::BoolWrapper::{7}::to_type]: forward function -/
+/- [traits::{traits::BoolWrapper#7}::to_type]: forward function
+   Source: 'src/traits.rs', lines 156:4-156:25 -/
 def BoolWrapper.to_type
-  (T : Type) (inst : ToType Bool T) (self : BoolWrapper) : Result T :=
-  inst.to_type self._0
+  (T : Type) (ToTypeBoolTInst : ToType Bool T) (self : BoolWrapper) :
+  Result T
+  :=
+  ToTypeBoolTInst.to_type self._0
 
-/- Trait implementation: [traits::BoolWrapper::{7}] -/
-def BoolWrapper.ToTypeInst (T : Type) (inst : ToType Bool T) : ToType
-  BoolWrapper T := {
-  to_type := BoolWrapper.to_type T inst
+/- Trait implementation: [traits::{traits::BoolWrapper#7}]
+   Source: 'src/traits.rs', lines 152:0-152:33 -/
+def traits.ToTypetraitsBoolWrapperTInst (T : Type) (ToTypeBoolTInst : ToType
+  Bool T) : ToType BoolWrapper T := {
+  to_type := BoolWrapper.to_type T ToTypeBoolTInst
 }
 
-/- [traits::WithConstTy::LEN2] -/
+/- [traits::WithConstTy::LEN2]
+   Source: 'src/traits.rs', lines 164:4-164:21 -/
 def with_const_ty_len2_body : Result Usize := Result.ret 32#usize
 def with_const_ty_len2_c : Usize :=
   eval_global with_const_ty_len2_body (by simp)
 
-/- Trait declaration: [traits::WithConstTy] -/
+/- Trait declaration: [traits::WithConstTy]
+   Source: 'src/traits.rs', lines 161:0-161:39 -/
 structure WithConstTy (Self : Type) (LEN : Usize) where
   LEN1 : Usize
   LEN2 : Usize
@@ -211,173 +264,219 @@ structure WithConstTy (Self : Type) (LEN : Usize) where
   W_clause_0 : ToU64 W
   f : W → Array U8 LEN → Result W
 
-/- [traits::Bool::{8}::LEN1] -/
+/- [traits::{bool#8}::LEN1]
+   Source: 'src/traits.rs', lines 175:4-175:21 -/
 def bool_len1_body : Result Usize := Result.ret 12#usize
 def bool_len1_c : Usize := eval_global bool_len1_body (by simp)
 
-/- [traits::Bool::{8}::f]: merged forward/backward function
-   (there is a single backward function, and the forward function returns ()) -/
+/- [traits::{bool#8}::f]: merged forward/backward function
+   (there is a single backward function, and the forward function returns ())
+   Source: 'src/traits.rs', lines 180:4-180:39 -/
 def Bool.f (i : U64) (a : Array U8 32#usize) : Result U64 :=
   Result.ret i
 
-/- Trait implementation: [traits::Bool::{8}] -/
-def Bool.WithConstTyInst : WithConstTy Bool 32#usize := {
+/- Trait implementation: [traits::{bool#8}]
+   Source: 'src/traits.rs', lines 174:0-174:29 -/
+def traits.WithConstTyBool32Inst : WithConstTy Bool 32#usize := {
   LEN1 := bool_len1_c
   LEN2 := with_const_ty_len2_c
   V := U8
   W := U64
-  W_clause_0 := u64.ToU64Inst
+  W_clause_0 := traits.ToU64U64Inst
   f := Bool.f
 }
 
-/- [traits::use_with_const_ty1]: forward function -/
+/- [traits::use_with_const_ty1]: forward function
+   Source: 'src/traits.rs', lines 183:0-183:75 -/
 def use_with_const_ty1
-  (H : Type) (LEN : Usize) (inst : WithConstTy H LEN) : Result Usize :=
-  let i := inst.LEN1
+  (H : Type) (LEN : Usize) (WithConstTyHLENInst : WithConstTy H LEN) :
+  Result Usize
+  :=
+  let i := WithConstTyHLENInst.LEN1
   Result.ret i
 
-/- [traits::use_with_const_ty2]: forward function -/
+/- [traits::use_with_const_ty2]: forward function
+   Source: 'src/traits.rs', lines 187:0-187:73 -/
 def use_with_const_ty2
-  (H : Type) (LEN : Usize) (inst : WithConstTy H LEN) (w : inst.W) :
+  (H : Type) (LEN : Usize) (WithConstTyHLENInst : WithConstTy H LEN)
+  (w : WithConstTyHLENInst.W) :
   Result Unit
   :=
   Result.ret ()
 
-/- [traits::use_with_const_ty3]: forward function -/
+/- [traits::use_with_const_ty3]: forward function
+   Source: 'src/traits.rs', lines 189:0-189:80 -/
 def use_with_const_ty3
-  (H : Type) (LEN : Usize) (inst : WithConstTy H LEN) (x : inst.W) :
+  (H : Type) (LEN : Usize) (WithConstTyHLENInst : WithConstTy H LEN)
+  (x : WithConstTyHLENInst.W) :
   Result U64
   :=
-  inst.W_clause_0.to_u64 x
+  WithConstTyHLENInst.W_clause_0.to_u64 x
 
-/- [traits::test_where1]: forward function -/
+/- [traits::test_where1]: forward function
+   Source: 'src/traits.rs', lines 193:0-193:40 -/
 def test_where1 (T : Type) (_x : T) : Result Unit :=
   Result.ret ()
 
-/- [traits::test_where2]: forward function -/
+/- [traits::test_where2]: forward function
+   Source: 'src/traits.rs', lines 194:0-194:57 -/
 def test_where2
-  (T : Type) (inst : WithConstTy T 32#usize) (_x : U32) : Result Unit :=
+  (T : Type) (WithConstTyT32Inst : WithConstTy T 32#usize) (_x : U32) :
+  Result Unit
+  :=
   Result.ret ()
 
-/- [alloc::string::String] -/
+/- [alloc::string::String]
+   Source: '/rustc/d59363ad0b6391b7fc5bbb02c9ccf9300eef3753/library/alloc/src/string.rs', lines 365:0-365:17 -/
 axiom alloc.string.String : Type
 
-/- Trait declaration: [traits::ParentTrait0] -/
+/- Trait declaration: [traits::ParentTrait0]
+   Source: 'src/traits.rs', lines 200:0-200:22 -/
 structure ParentTrait0 (Self : Type) where
   W : Type
   get_name : Self → Result alloc.string.String
   get_w : Self → Result W
 
-/- Trait declaration: [traits::ParentTrait1] -/
+/- Trait declaration: [traits::ParentTrait1]
+   Source: 'src/traits.rs', lines 205:0-205:22 -/
 structure ParentTrait1 (Self : Type) where
 
-/- Trait declaration: [traits::ChildTrait] -/
+/- Trait declaration: [traits::ChildTrait]
+   Source: 'src/traits.rs', lines 206:0-206:49 -/
 structure ChildTrait (Self : Type) where
-  parent_clause_0 : ParentTrait0 Self
-  parent_clause_1 : ParentTrait1 Self
+  ParentTrait0SelfInst : ParentTrait0 Self
+  ParentTrait1SelfInst : ParentTrait1 Self
 
-/- [traits::test_child_trait1]: forward function -/
+/- [traits::test_child_trait1]: forward function
+   Source: 'src/traits.rs', lines 209:0-209:56 -/
 def test_child_trait1
-  (T : Type) (inst : ChildTrait T) (x : T) : Result alloc.string.String :=
-  inst.parent_clause_0.get_name x
+  (T : Type) (ChildTraitTInst : ChildTrait T) (x : T) :
+  Result alloc.string.String
+  :=
+  ChildTraitTInst.ParentTrait0SelfInst.get_name x
 
-/- [traits::test_child_trait2]: forward function -/
+/- [traits::test_child_trait2]: forward function
+   Source: 'src/traits.rs', lines 213:0-213:54 -/
 def test_child_trait2
-  (T : Type) (inst : ChildTrait T) (x : T) : Result inst.parent_clause_0.W :=
-  inst.parent_clause_0.get_w x
+  (T : Type) (ChildTraitTInst : ChildTrait T) (x : T) :
+  Result ChildTraitTInst.ParentTrait0SelfInst.W
+  :=
+  ChildTraitTInst.ParentTrait0SelfInst.get_w x
 
-/- [traits::order1]: forward function -/
+/- [traits::order1]: forward function
+   Source: 'src/traits.rs', lines 219:0-219:59 -/
 def order1
-  (T U : Type) (inst : ParentTrait0 T) (inst0 : ParentTrait0 U) :
+  (T U : Type) (ParentTrait0TInst : ParentTrait0 T) (ParentTrait0UInst :
+  ParentTrait0 U) :
   Result Unit
   :=
   Result.ret ()
 
-/- Trait declaration: [traits::ChildTrait1] -/
+/- Trait declaration: [traits::ChildTrait1]
+   Source: 'src/traits.rs', lines 222:0-222:35 -/
 structure ChildTrait1 (Self : Type) where
-  parent_clause_0 : ParentTrait1 Self
+  ParentTrait1SelfInst : ParentTrait1 Self
 
-/- Trait implementation: [traits::usize::{9}] -/
-def usize.ParentTrait1Inst : ParentTrait1 Usize := {
+/- Trait implementation: [traits::{usize#9}]
+   Source: 'src/traits.rs', lines 224:0-224:27 -/
+def traits.ParentTrait1UsizeInst : ParentTrait1 Usize := {
 }
 
-/- Trait implementation: [traits::usize::{10}] -/
-def usize.ChildTrait1Inst : ChildTrait1 Usize := {
-  parent_clause_0 := usize.ParentTrait1Inst
+/- Trait implementation: [traits::{usize#10}]
+   Source: 'src/traits.rs', lines 225:0-225:26 -/
+def traits.ChildTrait1UsizeInst : ChildTrait1 Usize := {
+  ParentTrait1SelfInst := traits.ParentTrait1UsizeInst
 }
 
-/- Trait declaration: [traits::Iterator] -/
+/- Trait declaration: [traits::Iterator]
+   Source: 'src/traits.rs', lines 229:0-229:18 -/
 structure Iterator (Self : Type) where
   Item : Type
 
-/- Trait declaration: [traits::IntoIterator] -/
+/- Trait declaration: [traits::IntoIterator]
+   Source: 'src/traits.rs', lines 233:0-233:22 -/
 structure IntoIterator (Self : Type) where
   Item : Type
   IntoIter : Type
   IntoIter_clause_0 : Iterator IntoIter
   into_iter : Self → Result IntoIter
 
-/- Trait declaration: [traits::FromResidual] -/
+/- Trait declaration: [traits::FromResidual]
+   Source: 'src/traits.rs', lines 250:0-250:21 -/
 structure FromResidual (Self T : Type) where
 
-/- Trait declaration: [traits::Try] -/
+/- Trait declaration: [traits::Try]
+   Source: 'src/traits.rs', lines 246:0-246:48 -/
 structure Try (Self : Type) where
   Residual : Type
-  parent_clause_0 : FromResidual Self Residual
+  FromResidualSelftraitsTrySelfResidualInst : FromResidual Self Residual
 
-/- Trait declaration: [traits::WithTarget] -/
+/- Trait declaration: [traits::WithTarget]
+   Source: 'src/traits.rs', lines 252:0-252:20 -/
 structure WithTarget (Self : Type) where
   Target : Type
 
-/- Trait declaration: [traits::ParentTrait2] -/
+/- Trait declaration: [traits::ParentTrait2]
+   Source: 'src/traits.rs', lines 256:0-256:22 -/
 structure ParentTrait2 (Self : Type) where
   U : Type
   U_clause_0 : WithTarget U
 
-/- Trait declaration: [traits::ChildTrait2] -/
+/- Trait declaration: [traits::ChildTrait2]
+   Source: 'src/traits.rs', lines 260:0-260:35 -/
 structure ChildTrait2 (Self : Type) where
-  parent_clause_0 : ParentTrait2 Self
-  convert : parent_clause_0.U → Result parent_clause_0.U_clause_0.Target
+  ParentTrait2SelfInst : ParentTrait2 Self
+  convert : ParentTrait2SelfInst.U → Result
+    ParentTrait2SelfInst.U_clause_0.Target
 
-/- Trait implementation: [traits::u32::{11}] -/
-def u32.WithTargetInst : WithTarget U32 := {
+/- Trait implementation: [traits::{u32#11}]
+   Source: 'src/traits.rs', lines 264:0-264:23 -/
+def traits.WithTargetU32Inst : WithTarget U32 := {
   Target := U32
 }
 
-/- Trait implementation: [traits::u32::{12}] -/
-def u32.ParentTrait2Inst : ParentTrait2 U32 := {
+/- Trait implementation: [traits::{u32#12}]
+   Source: 'src/traits.rs', lines 268:0-268:25 -/
+def traits.ParentTrait2U32Inst : ParentTrait2 U32 := {
   U := U32
-  U_clause_0 := u32.WithTargetInst
+  U_clause_0 := traits.WithTargetU32Inst
 }
 
-/- [traits::u32::{13}::convert]: forward function -/
-def u32.convert (x : U32) : Result U32 :=
+/- [traits::{u32#13}::convert]: forward function
+   Source: 'src/traits.rs', lines 273:4-273:29 -/
+def U32.convert (x : U32) : Result U32 :=
   Result.ret x
 
-/- Trait implementation: [traits::u32::{13}] -/
-def u32.ChildTrait2Inst : ChildTrait2 U32 := {
-  parent_clause_0 := u32.ParentTrait2Inst
-  convert := u32.convert
+/- Trait implementation: [traits::{u32#13}]
+   Source: 'src/traits.rs', lines 272:0-272:24 -/
+def traits.ChildTrait2U32Inst : ChildTrait2 U32 := {
+  ParentTrait2SelfInst := traits.ParentTrait2U32Inst
+  convert := U32.convert
 }
 
-/- [traits::incr_u32]: forward function -/
-def incr_u32 (x : U32) : Result U32 :=
-  x + 1#u32
-
-/- Trait declaration: [traits::CFnOnce] -/
+/- Trait declaration: [traits::CFnOnce]
+   Source: 'src/traits.rs', lines 286:0-286:23 -/
 structure CFnOnce (Self Args : Type) where
   Output : Type
   call_once : Self → Args → Result Output
 
-/- Trait declaration: [traits::CFnMut] -/
+/- Trait declaration: [traits::CFnMut]
+   Source: 'src/traits.rs', lines 292:0-292:37 -/
 structure CFnMut (Self Args : Type) where
-  parent_clause_0 : CFnOnce Self Args
-  call_mut : Self → Args → Result parent_clause_0.Output
-  call_mut_back : Self → Args → parent_clause_0.Output → Result Self
+  CFnOnceSelfArgsInst : CFnOnce Self Args
+  call_mut : Self → Args → Result CFnOnceSelfArgsInst.Output
+  call_mut_back : Self → Args → CFnOnceSelfArgsInst.Output → Result Self
 
-/- Trait declaration: [traits::CFn] -/
+/- Trait declaration: [traits::CFn]
+   Source: 'src/traits.rs', lines 296:0-296:33 -/
 structure CFn (Self Args : Type) where
-  parent_clause_0 : CFnMut Self Args
-  call_mut : Self → Args → Result parent_clause_0.parent_clause_0.Output
+  CFnMutSelfArgsInst : CFnMut Self Args
+  call_mut : Self → Args → Result
+    CFnMutSelfArgsInst.CFnOnceSelfArgsInst.Output
+
+/- [traits::incr_u32]: forward function
+   Source: 'src/traits.rs', lines 300:0-300:30 -/
+def incr_u32 (x : U32) : Result U32 :=
+  x + 1#u32
 
 end traits