diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2db07e0..1c1a479 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@
 - Refactored PrintBox configuration, smaller footprint and allowing control over the backends.
 - Changed `highlighted_roots` to a more general `prune_upto`: prune to only the highlighted boxes up to the given depth.
 - TODO: Fixes #9: handle tuple and record patterns by automatically wrapping in an alias pattern.
+- TODO: Adresses #5: less reliance on the concrete AST data structures.
 
 ## [0.9.0] -- 2024-01-18
 
diff --git a/ppx_minidebug.ml b/ppx_minidebug.ml
index 6bf9587..bb30492 100644
--- a/ppx_minidebug.ml
+++ b/ppx_minidebug.ml
@@ -20,17 +20,6 @@ let rec pat2expr pat =
       @@ Location.error_extensionf ~loc
            "ppx_minidebug requires a pattern identifier here: try using an `as` alias."
 
-let rec pat2pat_res pat =
-  let loc = pat.ppat_loc in
-  match pat.ppat_desc with
-  | Ppat_constraint (pat', _) -> pat2pat_res pat'
-  | Ppat_alias (_, ident) | Ppat_var ident ->
-      Ast_builder.Default.ppat_var ~loc { ident with txt = ident.txt ^ "__res" }
-  | _ ->
-      Ast_builder.Default.ppat_extension ~loc
-      @@ Location.error_extensionf ~loc
-           "ppx_minidebug requires a pattern identifier here: try using an `as` alias."
-
 let open_log_preamble ?(brief = false) ?(message = "") ~loc () =
   if brief then
     [%expr
@@ -113,8 +102,7 @@ let log_string ~loc ~descr_loc s =
   [%expr
     Debug_runtime.log_value_show
       ~descr:[%e A.estring ~loc:descr_loc.loc descr_loc.txt]
-      ~entry_id:__entry_id
-      ~v:[%e A.estring ~loc s]]
+      ~entry_id:__entry_id ~v:[%e A.estring ~loc s]]
 
 type fun_arg =
   | Pexp_fun_arg of
@@ -162,11 +150,27 @@ let rec expand_fun body = function
         pexp_attributes;
       }
 
-let debug_fun callback ?bind ?descr_loc ?typ_opt exp =
+let bound_patterns ~alt_typ pat =
+  let bind_pat, bound =
+    match (alt_typ, pat) with
+    | ( _,
+        [%pat?
+          ([%p? { ppat_desc = Ppat_var descr_loc | Ppat_alias (_, descr_loc); _ } as pat] :
+            [%t? typ])] ) ->
+        (A.ppat_var ~loc:pat.ppat_loc descr_loc, [ (descr_loc, pat, typ) ])
+    | Some typ, ({ ppat_desc = Ppat_var descr_loc | Ppat_alias (_, descr_loc); _ } as pat)
+      ->
+        (A.ppat_var ~loc:pat.ppat_loc descr_loc, [ (descr_loc, pat, typ) ])
+    | _ -> (A.ppat_any ~loc:pat.ppat_loc, [])
+  in
+  let loc = pat.ppat_loc in
+  A.ppat_alias ~loc bind_pat { txt = "__res"; loc }, bound
+
+let debug_fun callback ?descr_loc ?alt_typ exp =
   let args, body, typ_opt2 = collect_fun [] exp in
   let loc = exp.pexp_loc in
   let typ =
-    match (typ_opt, typ_opt2) with
+    match (alt_typ, typ_opt2) with
     | Some typ, _ | None, Some typ -> Some typ
     | None, None when !track_branches -> None
     | None, None -> raise Not_transforming
@@ -177,28 +181,19 @@ let debug_fun callback ?bind ?descr_loc ?typ_opt exp =
     | None -> raise Not_transforming
     | Some descr_loc -> descr_loc
   in
-  let bind =
-    match bind with
-    | None -> pat2pat_res (Ast_builder.Default.ppat_var ~loc descr_loc)
-    | Some bind -> bind
-  in
   let arg_logs =
-    List.filter_map
-      (function
-        | Pexp_fun_arg
-            ( _arg_label,
-              _opt_val,
-              [%pat?
-                ([%p?
-                   { ppat_desc = Ppat_var descr_loc | Ppat_alias (_, descr_loc); _ } as
-                   pat] :
-                  [%t? typ])],
-              pexp_loc,
-              _pexp_loc_stack,
-              _pexp_attributes ) ->
-            Some (!log_value ~loc:pexp_loc ~typ ~descr_loc (pat2expr pat))
-        | _ -> None)
-      args
+    List.concat
+    @@ List.map
+         (function
+           | Pexp_fun_arg
+               (_arg_label, _opt_val, pat, pexp_loc, _pexp_loc_stack, _pexp_attributes) ->
+               let _, bound = bound_patterns ~alt_typ:None pat in
+               List.map
+                 (fun (descr_loc, pat, typ) ->
+                   !log_value ~loc:pexp_loc ~typ ~descr_loc (pat2expr pat))
+                 bound
+           | _ -> [])
+         args
   in
   let preamble = open_log_preamble ~message:descr_loc.txt ~loc () in
   let arg_logs =
@@ -209,7 +204,10 @@ let debug_fun callback ?bind ?descr_loc ?typ_opt exp =
           [%e e2]])
       preamble arg_logs
   in
-  let result = pat2pat_res bind in
+  let result =
+    let loc = descr_loc.loc in
+    Ast_builder.Default.ppat_var ~loc { loc; txt = "__res" }
+  in
   let body =
     [%expr
       let __entry_id = Debug_runtime.get_entry_id () in
@@ -242,7 +240,7 @@ let debug_fun callback ?bind ?descr_loc ?typ_opt exp =
 let debug_binding callback vb =
   let pat = vb.pvb_pat in
   let loc = vb.pvb_loc in
-  let descr_loc, typ_opt =
+  let descr_loc, alt_typ =
     match (vb.pvb_pat, vb.pvb_expr) with
     | ( [%pat?
           ([%p? { ppat_desc = Ppat_var descr_loc | Ppat_alias (_, descr_loc); _ }] :
@@ -256,14 +254,24 @@ let debug_binding callback vb =
         (descr_loc, None)
     | _ -> raise Not_transforming
   in
-  match (vb.pvb_expr.pexp_desc, typ_opt) with
-  | Pexp_newtype _, _ | Pexp_fun _, _ ->
-      {
-        vb with
-        pvb_expr = debug_fun callback ~bind:vb.pvb_pat ~descr_loc ?typ_opt vb.pvb_expr;
-      }
-  | _, Some typ ->
-      let result = pat2pat_res pat in
+  match vb.pvb_expr.pexp_desc with
+  | Pexp_newtype _ | Pexp_fun _ ->
+      { vb with pvb_expr = debug_fun callback ~descr_loc ?alt_typ vb.pvb_expr }
+  | _ ->
+      let result, bound = bound_patterns ~alt_typ pat in
+      if bound = [] then raise Not_transforming;
+      let logs_expr =
+        List.map
+          (fun (descr_loc, pat, typ) ->
+            !log_value ~loc:vb.pvb_expr.pexp_loc ~typ ~descr_loc (pat2expr pat))
+          bound
+        |> List.fold_left
+             (fun e1 e2 ->
+               [%expr
+                 [%e e1];
+                 [%e e2]])
+             [%expr ()]
+      in
       let exp =
         [%expr
           let __entry_id = Debug_runtime.get_entry_id () in
@@ -280,7 +288,7 @@ let debug_binding callback vb =
             else
               match [%e callback vb.pvb_expr] with
               | [%p result] ->
-                  [%e !log_value ~loc ~typ ~descr_loc (pat2expr result)];
+                  [%e logs_expr];
                   Debug_runtime.close_log ();
                   [%e pat2expr result]
               | exception e ->
@@ -288,7 +296,6 @@ let debug_binding callback vb =
                   raise e)]
       in
       { vb with pvb_expr = exp }
-  | _ -> raise Not_transforming
 
 type rule = {
   ext_point : string;
diff --git a/test/test_debug_pp.expected.ml b/test/test_debug_pp.expected.ml
index 0c16f3f..9d16f36 100644
--- a/test/test_debug_pp.expected.ml
+++ b/test/test_debug_pp.expected.ml
@@ -42,19 +42,20 @@ let bar (x : t) =
                     failwith "ppx_minidebug: max_nesting_depth exceeded")
                  else
                    (match (x.first + 1 : num) with
-                    | y__res ->
-                        (Debug_runtime.log_value_pp ~descr:"y"
-                           ~entry_id:__entry_id ~pp:pp_num ~v:y__res;
+                    | y as __res ->
+                        ((();
+                          Debug_runtime.log_value_pp ~descr:"y"
+                            ~entry_id:__entry_id ~pp:pp_num ~v:y);
                          Debug_runtime.close_log ();
-                         y__res)
+                         __res)
                     | exception e -> (Debug_runtime.close_log (); raise e))) in
             x.second * y
       with
-      | bar__res ->
+      | __res ->
           (Debug_runtime.log_value_pp ~descr:"bar" ~entry_id:__entry_id
-             ~pp:pp_num ~v:bar__res;
+             ~pp:pp_num ~v:__res;
            Debug_runtime.close_log ();
-           bar__res)
+           __res)
       | exception e -> (Debug_runtime.close_log (); raise e)) : num)
 let () = ignore @@ (bar { first = 7; second = 42 })
 let baz (x : t) =
@@ -95,19 +96,20 @@ let baz (x : t) =
                     failwith "ppx_minidebug: max_nesting_depth exceeded")
                  else
                    (match { first = (x.first + 1); second = 3 } with
-                    | _yz__res ->
-                        (Debug_runtime.log_value_pp ~descr:"_yz"
-                           ~entry_id:__entry_id ~pp ~v:_yz__res;
+                    | _yz as __res ->
+                        ((();
+                          Debug_runtime.log_value_pp ~descr:"_yz"
+                            ~entry_id:__entry_id ~pp ~v:_yz);
                          Debug_runtime.close_log ();
-                         _yz__res)
+                         __res)
                     | exception e -> (Debug_runtime.close_log (); raise e))) in
             (x.second * y) + z
       with
-      | baz__res ->
+      | __res ->
           (Debug_runtime.log_value_pp ~descr:"baz" ~entry_id:__entry_id
-             ~pp:pp_num ~v:baz__res;
+             ~pp:pp_num ~v:__res;
            Debug_runtime.close_log ();
-           baz__res)
+           __res)
       | exception e -> (Debug_runtime.close_log (); raise e)) : num)
 let () = ignore @@ (baz { first = 7; second = 42 })
 let rec loop (depth : num) (x : t) =
@@ -164,11 +166,12 @@ let rec loop (depth : num) (x : t) =
                                     second = (x.first + 2)
                                   } : num)
                          with
-                         | y__res ->
-                             (Debug_runtime.log_value_pp ~descr:"y"
-                                ~entry_id:__entry_id ~pp:pp_num ~v:y__res;
+                         | y as __res ->
+                             ((();
+                               Debug_runtime.log_value_pp ~descr:"y"
+                                 ~entry_id:__entry_id ~pp:pp_num ~v:y);
                               Debug_runtime.close_log ();
-                              y__res)
+                              __res)
                          | exception e ->
                              (Debug_runtime.close_log (); raise e))) in
                  let z : num =
@@ -194,19 +197,20 @@ let rec loop (depth : num) (x : t) =
                                   { first = (x.second + 1); second = y } : 
                            num)
                          with
-                         | z__res ->
-                             (Debug_runtime.log_value_pp ~descr:"z"
-                                ~entry_id:__entry_id ~pp:pp_num ~v:z__res;
+                         | z as __res ->
+                             ((();
+                               Debug_runtime.log_value_pp ~descr:"z"
+                                 ~entry_id:__entry_id ~pp:pp_num ~v:z);
                               Debug_runtime.close_log ();
-                              z__res)
+                              __res)
                          | exception e ->
                              (Debug_runtime.close_log (); raise e))) in
                  z + 7)
       with
-      | loop__res ->
+      | __res ->
           (Debug_runtime.log_value_pp ~descr:"loop" ~entry_id:__entry_id
-             ~pp:pp_num ~v:loop__res;
+             ~pp:pp_num ~v:__res;
            Debug_runtime.close_log ();
-           loop__res)
+           __res)
       | exception e -> (Debug_runtime.close_log (); raise e)) : num)
 let () = ignore @@ (loop 0 { first = 7; second = 42 })
diff --git a/test/test_debug_sexp.expected.ml b/test/test_debug_sexp.expected.ml
index 4ac0b0a..e07f9a6 100644
--- a/test/test_debug_sexp.expected.ml
+++ b/test/test_debug_sexp.expected.ml
@@ -40,20 +40,20 @@ let foo (x : int) =
                     failwith "ppx_minidebug: max_nesting_depth exceeded")
                  else
                    (match (x + 1 : int) with
-                    | y__res ->
-                        (Debug_runtime.log_value_sexp ~descr:"y"
-                           ~entry_id:__entry_id
-                           ~sexp:(([%sexp_of : int]) y__res);
+                    | y as __res ->
+                        ((();
+                          Debug_runtime.log_value_sexp ~descr:"y"
+                            ~entry_id:__entry_id ~sexp:(([%sexp_of : int]) y));
                          Debug_runtime.close_log ();
-                         y__res)
+                         __res)
                     | exception e -> (Debug_runtime.close_log (); raise e))) in
             [x; y; 2 * y]
       with
-      | foo__res ->
+      | __res ->
           (Debug_runtime.log_value_sexp ~descr:"foo" ~entry_id:__entry_id
-             ~sexp:(([%sexp_of : int list]) foo__res);
+             ~sexp:(([%sexp_of : int list]) __res);
            Debug_runtime.close_log ();
-           foo__res)
+           __res)
       | exception e -> (Debug_runtime.close_log (); raise e)) : int list)
 let () = ignore @@ (List.hd @@ (foo 7))
 type t = {
@@ -98,20 +98,20 @@ let bar (x : t) =
                     failwith "ppx_minidebug: max_nesting_depth exceeded")
                  else
                    (match (x.first + 1 : int) with
-                    | y__res ->
-                        (Debug_runtime.log_value_sexp ~descr:"y"
-                           ~entry_id:__entry_id
-                           ~sexp:(([%sexp_of : int]) y__res);
+                    | y as __res ->
+                        ((();
+                          Debug_runtime.log_value_sexp ~descr:"y"
+                            ~entry_id:__entry_id ~sexp:(([%sexp_of : int]) y));
                          Debug_runtime.close_log ();
-                         y__res)
+                         __res)
                     | exception e -> (Debug_runtime.close_log (); raise e))) in
             x.second * y
       with
-      | bar__res ->
+      | __res ->
           (Debug_runtime.log_value_sexp ~descr:"bar" ~entry_id:__entry_id
-             ~sexp:(([%sexp_of : int]) bar__res);
+             ~sexp:(([%sexp_of : int]) __res);
            Debug_runtime.close_log ();
-           bar__res)
+           __res)
       | exception e -> (Debug_runtime.close_log (); raise e)) : int)
 let () = ignore @@ (bar { first = 7; second = 42 })
 let baz (x : t) =
@@ -153,12 +153,13 @@ let baz (x : t) =
                     failwith "ppx_minidebug: max_nesting_depth exceeded")
                  else
                    (match ((x.first + 1), 3) with
-                    | _yz__res ->
-                        (Debug_runtime.log_value_sexp ~descr:"_yz"
-                           ~entry_id:__entry_id
-                           ~sexp:(([%sexp_of : (int * int)]) _yz__res);
+                    | _yz as __res ->
+                        ((();
+                          Debug_runtime.log_value_sexp ~descr:"_yz"
+                            ~entry_id:__entry_id
+                            ~sexp:(([%sexp_of : (int * int)]) _yz));
                          Debug_runtime.close_log ();
-                         _yz__res)
+                         __res)
                     | exception e -> (Debug_runtime.close_log (); raise e))) in
             let (((u, w) as _uw) : (int * int)) =
               let __entry_id = Debug_runtime.get_entry_id () in
@@ -179,20 +180,21 @@ let baz (x : t) =
                     failwith "ppx_minidebug: max_nesting_depth exceeded")
                  else
                    (match (7, 13) with
-                    | _uw__res ->
-                        (Debug_runtime.log_value_sexp ~descr:"_uw"
-                           ~entry_id:__entry_id
-                           ~sexp:(([%sexp_of : (int * int)]) _uw__res);
+                    | _uw as __res ->
+                        ((();
+                          Debug_runtime.log_value_sexp ~descr:"_uw"
+                            ~entry_id:__entry_id
+                            ~sexp:(([%sexp_of : (int * int)]) _uw));
                          Debug_runtime.close_log ();
-                         _uw__res)
+                         __res)
                     | exception e -> (Debug_runtime.close_log (); raise e))) in
             (((x.second * y) + z) + u) + w
       with
-      | baz__res ->
+      | __res ->
           (Debug_runtime.log_value_sexp ~descr:"baz" ~entry_id:__entry_id
-             ~sexp:(([%sexp_of : int]) baz__res);
+             ~sexp:(([%sexp_of : int]) __res);
            Debug_runtime.close_log ();
-           baz__res)
+           __res)
       | exception e -> (Debug_runtime.close_log (); raise e)) : int)
 let () = ignore @@ (baz { first = 7; second = 42 })
 let lab ~x:(x : int)  =
@@ -234,20 +236,20 @@ let lab ~x:(x : int)  =
                     failwith "ppx_minidebug: max_nesting_depth exceeded")
                  else
                    (match (x + 1 : int) with
-                    | y__res ->
-                        (Debug_runtime.log_value_sexp ~descr:"y"
-                           ~entry_id:__entry_id
-                           ~sexp:(([%sexp_of : int]) y__res);
+                    | y as __res ->
+                        ((();
+                          Debug_runtime.log_value_sexp ~descr:"y"
+                            ~entry_id:__entry_id ~sexp:(([%sexp_of : int]) y));
                          Debug_runtime.close_log ();
-                         y__res)
+                         __res)
                     | exception e -> (Debug_runtime.close_log (); raise e))) in
             [x; y; 2 * y]
       with
-      | lab__res ->
+      | __res ->
           (Debug_runtime.log_value_sexp ~descr:"lab" ~entry_id:__entry_id
-             ~sexp:(([%sexp_of : int list]) lab__res);
+             ~sexp:(([%sexp_of : int list]) __res);
            Debug_runtime.close_log ();
-           lab__res)
+           __res)
       | exception e -> (Debug_runtime.close_log (); raise e)) : int list)
 let () = ignore @@ (List.hd @@ (lab ~x:7))
 let rec loop (depth : int) (x : t) =
@@ -305,12 +307,13 @@ let rec loop (depth : int) (x : t) =
                                     second = (x.first + 2)
                                   } : int)
                          with
-                         | y__res ->
-                             (Debug_runtime.log_value_sexp ~descr:"y"
-                                ~entry_id:__entry_id
-                                ~sexp:(([%sexp_of : int]) y__res);
+                         | y as __res ->
+                             ((();
+                               Debug_runtime.log_value_sexp ~descr:"y"
+                                 ~entry_id:__entry_id
+                                 ~sexp:(([%sexp_of : int]) y));
                               Debug_runtime.close_log ();
-                              y__res)
+                              __res)
                          | exception e ->
                              (Debug_runtime.close_log (); raise e))) in
                  let z : int =
@@ -336,20 +339,21 @@ let rec loop (depth : int) (x : t) =
                                   { first = (x.second + 1); second = y } : 
                            int)
                          with
-                         | z__res ->
-                             (Debug_runtime.log_value_sexp ~descr:"z"
-                                ~entry_id:__entry_id
-                                ~sexp:(([%sexp_of : int]) z__res);
+                         | z as __res ->
+                             ((();
+                               Debug_runtime.log_value_sexp ~descr:"z"
+                                 ~entry_id:__entry_id
+                                 ~sexp:(([%sexp_of : int]) z));
                               Debug_runtime.close_log ();
-                              z__res)
+                              __res)
                          | exception e ->
                              (Debug_runtime.close_log (); raise e))) in
                  z + 7)
       with
-      | loop__res ->
+      | __res ->
           (Debug_runtime.log_value_sexp ~descr:"loop" ~entry_id:__entry_id
-             ~sexp:(([%sexp_of : int]) loop__res);
+             ~sexp:(([%sexp_of : int]) __res);
            Debug_runtime.close_log ();
-           loop__res)
+           __res)
       | exception e -> (Debug_runtime.close_log (); raise e)) : int)
 let () = ignore @@ (loop 0 { first = 7; second = 42 })
diff --git a/test/test_debug_show.expected.ml b/test/test_debug_show.expected.ml
index dbf0c7f..686827f 100644
--- a/test/test_debug_show.expected.ml
+++ b/test/test_debug_show.expected.ml
@@ -39,19 +39,20 @@ let foo (x : int) =
                     failwith "ppx_minidebug: max_nesting_depth exceeded")
                  else
                    (match (x + 1 : int) with
-                    | y__res ->
-                        (Debug_runtime.log_value_show ~descr:"y"
-                           ~entry_id:__entry_id ~v:(([%show : int]) y__res);
+                    | y as __res ->
+                        ((();
+                          Debug_runtime.log_value_show ~descr:"y"
+                            ~entry_id:__entry_id ~v:(([%show : int]) y));
                          Debug_runtime.close_log ();
-                         y__res)
+                         __res)
                     | exception e -> (Debug_runtime.close_log (); raise e))) in
             [x; y; 2 * y]
       with
-      | foo__res ->
+      | __res ->
           (Debug_runtime.log_value_show ~descr:"foo" ~entry_id:__entry_id
-             ~v:(([%show : int list]) foo__res);
+             ~v:(([%show : int list]) __res);
            Debug_runtime.close_log ();
-           foo__res)
+           __res)
       | exception e -> (Debug_runtime.close_log (); raise e)) : int list)
 let () = ignore @@ (List.hd @@ (foo 7))
 type t = {
@@ -96,19 +97,20 @@ let bar (x : t) =
                     failwith "ppx_minidebug: max_nesting_depth exceeded")
                  else
                    (match (x.first + 1 : int) with
-                    | y__res ->
-                        (Debug_runtime.log_value_show ~descr:"y"
-                           ~entry_id:__entry_id ~v:(([%show : int]) y__res);
+                    | y as __res ->
+                        ((();
+                          Debug_runtime.log_value_show ~descr:"y"
+                            ~entry_id:__entry_id ~v:(([%show : int]) y));
                          Debug_runtime.close_log ();
-                         y__res)
+                         __res)
                     | exception e -> (Debug_runtime.close_log (); raise e))) in
             x.second * y
       with
-      | bar__res ->
+      | __res ->
           (Debug_runtime.log_value_show ~descr:"bar" ~entry_id:__entry_id
-             ~v:(([%show : int]) bar__res);
+             ~v:(([%show : int]) __res);
            Debug_runtime.close_log ();
-           bar__res)
+           __res)
       | exception e -> (Debug_runtime.close_log (); raise e)) : int)
 let () = ignore @@ (bar { first = 7; second = 42 })
 let baz (x : t) =
@@ -150,20 +152,21 @@ let baz (x : t) =
                     failwith "ppx_minidebug: max_nesting_depth exceeded")
                  else
                    (match ((x.first + 1), 3) with
-                    | _yz__res ->
-                        (Debug_runtime.log_value_show ~descr:"_yz"
-                           ~entry_id:__entry_id
-                           ~v:(([%show : (int * int)]) _yz__res);
+                    | _yz as __res ->
+                        ((();
+                          Debug_runtime.log_value_show ~descr:"_yz"
+                            ~entry_id:__entry_id
+                            ~v:(([%show : (int * int)]) _yz));
                          Debug_runtime.close_log ();
-                         _yz__res)
+                         __res)
                     | exception e -> (Debug_runtime.close_log (); raise e))) in
             (x.second * y) + z
       with
-      | baz__res ->
+      | __res ->
           (Debug_runtime.log_value_show ~descr:"baz" ~entry_id:__entry_id
-             ~v:(([%show : int]) baz__res);
+             ~v:(([%show : int]) __res);
            Debug_runtime.close_log ();
-           baz__res)
+           __res)
       | exception e -> (Debug_runtime.close_log (); raise e)) : int)
 let () = ignore @@ (baz { first = 7; second = 42 })
 let rec loop (depth : int) (x : t) =
@@ -221,12 +224,12 @@ let rec loop (depth : int) (x : t) =
                                     second = (x.first + 2)
                                   } : int)
                          with
-                         | y__res ->
-                             (Debug_runtime.log_value_show ~descr:"y"
-                                ~entry_id:__entry_id
-                                ~v:(([%show : int]) y__res);
+                         | y as __res ->
+                             ((();
+                               Debug_runtime.log_value_show ~descr:"y"
+                                 ~entry_id:__entry_id ~v:(([%show : int]) y));
                               Debug_runtime.close_log ();
-                              y__res)
+                              __res)
                          | exception e ->
                              (Debug_runtime.close_log (); raise e))) in
                  let z : int =
@@ -252,20 +255,20 @@ let rec loop (depth : int) (x : t) =
                                   { first = (x.second + 1); second = y } : 
                            int)
                          with
-                         | z__res ->
-                             (Debug_runtime.log_value_show ~descr:"z"
-                                ~entry_id:__entry_id
-                                ~v:(([%show : int]) z__res);
+                         | z as __res ->
+                             ((();
+                               Debug_runtime.log_value_show ~descr:"z"
+                                 ~entry_id:__entry_id ~v:(([%show : int]) z));
                               Debug_runtime.close_log ();
-                              z__res)
+                              __res)
                          | exception e ->
                              (Debug_runtime.close_log (); raise e))) in
                  z + 7)
       with
-      | loop__res ->
+      | __res ->
           (Debug_runtime.log_value_show ~descr:"loop" ~entry_id:__entry_id
-             ~v:(([%show : int]) loop__res);
+             ~v:(([%show : int]) __res);
            Debug_runtime.close_log ();
-           loop__res)
+           __res)
       | exception e -> (Debug_runtime.close_log (); raise e)) : int)
 let () = ignore @@ (loop 0 { first = 7; second = 42 })