diff --git a/cli/src/main.rs b/cli/src/main.rs
index c3d9671a41..5932ce29f6 100644
--- a/cli/src/main.rs
+++ b/cli/src/main.rs
@@ -364,8 +364,8 @@ fn gen(
     let ptr_bytes = target.pointer_width().unwrap().bytes() as u32;
     let layout = Layout::new(&arena, content, &subs, ptr_bytes).unwrap_or_else(|err| {
         panic!(
-            "Code gen error in test: could not convert to layout. Err was {:?} and Subs were {:?}",
-            err, subs
+            "Code gen error in CLI: could not convert to layout. Err was {:?}",
+            err
         )
     });
 
diff --git a/cli/src/repl.rs b/cli/src/repl.rs
index 292fbf36c3..b65f7724ac 100644
--- a/cli/src/repl.rs
+++ b/cli/src/repl.rs
@@ -221,8 +221,8 @@ pub fn gen(src: &str, target: Triple, opt_level: OptLevel) -> Result<(String, St
     // Compute main_fn_type before moving subs to Env
     let layout = Layout::new(&arena, content, &subs, ptr_bytes).unwrap_or_else(|err| {
         panic!(
-            "Code gen error in test: could not convert to layout. Err was {:?} and Subs were {:?}",
-            err, subs
+            "Code gen error in test: could not convert to layout. Err was {:?}",
+            err
         )
     });
     let execution_engine = module
diff --git a/compiler/build/src/program.rs b/compiler/build/src/program.rs
index 3e769c86bf..14e372c884 100644
--- a/compiler/build/src/program.rs
+++ b/compiler/build/src/program.rs
@@ -140,8 +140,8 @@ pub fn build(
     let ptr_bytes = target.pointer_width().unwrap().bytes() as u32;
     let layout = Layout::new(&arena, content, &subs, ptr_bytes).unwrap_or_else(|err| {
         panic!(
-            "Code gen error in test: could not convert to layout. Err was {:?} and Subs were {:?}",
-            err, subs
+            "Code gen error in Program: could not convert to layout. Err was {:?}",
+            err
         )
     });
 
diff --git a/compiler/gen/tests/helpers/eval.rs b/compiler/gen/tests/helpers/eval.rs
index ac45671df5..4f5ad5f317 100644
--- a/compiler/gen/tests/helpers/eval.rs
+++ b/compiler/gen/tests/helpers/eval.rs
@@ -39,7 +39,7 @@ macro_rules! assert_llvm_evals_to {
 
         // Compute main_fn_type before moving subs to Env
         let layout = Layout::new(&arena, content, &subs, ptr_bytes)
-    .unwrap_or_else(|err| panic!("Code gen error in test: could not convert to layout. Err was {:?} and Subs were {:?}", err, subs));
+    .unwrap_or_else(|err| panic!("Code gen error in test: could not convert to layout. Err was {:?}", err));
         let execution_engine =
             module
             .create_jit_execution_engine(OptimizationLevel::None)
@@ -211,7 +211,7 @@ macro_rules! assert_opt_evals_to {
 
         // Compute main_fn_type before moving subs to Env
         let layout = Layout::new(&arena, content, &subs, ptr_bytes)
-    .unwrap_or_else(|err| panic!("Code gen error in test: could not convert to layout. Err was {:?} and Subs were {:?}", err, subs));
+    .unwrap_or_else(|err| panic!("Code gen error in test: could not convert to layout. Err was {:?}", err));
 
         let execution_engine =
             module