diff --git a/lib/bap_types/bap_ir.ml b/lib/bap_types/bap_ir.ml
index cb72f62f8..405710906 100644
--- a/lib/bap_types/bap_ir.ml
+++ b/lib/bap_types/bap_ir.ml
@@ -1662,7 +1662,7 @@ module Ir_blk = struct
     let (++) = Set.union and (--) = Set.diff in
     let init = Bap_var.Set.empty,Bap_var.Set.empty in
     fst @@ Seq.fold (elts blk) ~init ~f:(fun (vars,kill) -> function
-        | `Phi phi -> vars, kill
+        | `Phi _ -> vars, kill
         | `Def def ->
           Ir_def.free_vars def -- kill ++ vars,
           Set.add kill (Ir_def.lhs def)
@@ -1731,14 +1731,16 @@ end
 module Ir_sub = struct
   type t = sub term
 
-  let new_empty ?(tid=Tid.create ()) ?name () : t =
-    let name = match name with
+  let make_name ?name tid =
+    match name with
+    | Some name -> name
+    | None -> match Tid.get_name tid with
+      | None -> Tid.to_string tid
       | Some name -> name
-      | None -> match Tid.get_name tid with
-        | None -> Tid.to_string tid
-        | Some name -> name in
+
+  let new_empty ?(tid=Tid.create ()) ?name () : t =
     make_term tid {
-      name;
+      name = make_name ?name tid;
       args = [| |] ;
       blks = [| |] ;
     }
@@ -1872,9 +1874,7 @@ module Ir_sub = struct
         | None -> Tid.create () in
       let args = Vec.to_array args in
       let blks = Vec.to_array blks in
-      let name = match name with
-        | Some name -> name
-        | None -> Format.asprintf "sub_%a" Tid.pp tid in
+      let name = make_name ?name tid in
       make_term tid {name; args; blks}
   end