diff --git a/testing/btest/Baseline/language.uninitialized-local/out b/testing/btest/Baseline/language.uninitialized-local/out
index 71f956d196..44e2ccadc9 100644
--- a/testing/btest/Baseline/language.uninitialized-local/out
+++ b/testing/btest/Baseline/language.uninitialized-local/out
@@ -1,2 +1,2 @@
 ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
-expression error in <...>/uninitialized-local.zeek, line 16: value used but not set (my_string)
+expression error in <...>/uninitialized-local.zeek, line 19: value used but not set (my_string)
diff --git a/testing/btest/Baseline/language.when-capture-errors/out b/testing/btest/Baseline/language.when-capture-errors/out
index d73d761602..35ae709e9b 100644
--- a/testing/btest/Baseline/language.when-capture-errors/out
+++ b/testing/btest/Baseline/language.when-capture-errors/out
@@ -2,7 +2,7 @@
 error in <...>/when-capture-errors.zeek, lines 19-22: orig1 is used inside "when" statement but not captured (when (0 < g) { print orig1})
 error in <...>/when-capture-errors.zeek, lines 25-28: orig3 is used inside "when" statement but not captured (when (0 < g || orig3) { print g})
 error in <...>/when-capture-errors.zeek, lines 34-38: orig1 is used inside "when" statement but not captured (when (0 < g) { print g} timeout 1.0 sec { print orig1})
-error in <...>/when-capture-errors.zeek, lines 66-70: orig2 is used inside "when" statement but not captured (when (0 < g) { print orig1} timeout 1.0 sec { print orig2})
-error in <...>/when-capture-errors.zeek, lines 76-80: orig3 is captured but not used inside "when" statement (when (0 < g) { print orig1} timeout 1.0 sec { print orig2})
+error in <...>/when-capture-errors.zeek, lines 66-70: orig2 is used inside "when" statement but not captured (when [orig1](0 < g) { print orig1} timeout 1.0 sec { print orig2})
+error in <...>/when-capture-errors.zeek, lines 76-80: orig3 is captured but not used inside "when" statement (when [orig1, orig2, orig3](0 < g) { print orig1} timeout 1.0 sec { print orig2})
 error in <...>/when-capture-errors.zeek, line 83: no such local identifier: l1
 error in <...>/when-capture-errors.zeek, line 89: no such local identifier: l2
diff --git a/testing/btest/Baseline/language.when-unitialized-rhs/out b/testing/btest/Baseline/language.when-unitialized-rhs/out
index fef12b931c..fc12245c91 100644
--- a/testing/btest/Baseline/language.when-unitialized-rhs/out
+++ b/testing/btest/Baseline/language.when-unitialized-rhs/out
@@ -1,6 +1,6 @@
 ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
-expression error in <...>/when-unitialized-rhs.zeek, line 12: value used but not set (crashMe)
-expression error in <...>/when-unitialized-rhs.zeek, line 17: value used but not set (x)
+expression error in <...>/when-unitialized-rhs.zeek, line 13: value used but not set (crashMe)
+expression error in <...>/when-unitialized-rhs.zeek, line 18: value used but not set (x)
 1
 2
 3