diff --git a/testing/btest/Baseline.zam/bifs.from_json-2/.stderr b/testing/btest/Baseline.zam/bifs.from_json-2/.stderr
index 372f599e7f..1a3fceee72 100644
--- a/testing/btest/Baseline.zam/bifs.from_json-2/.stderr
+++ b/testing/btest/Baseline.zam/bifs.from_json-2/.stderr
@@ -1,2 +1,2 @@
 ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
-error in <...>/from_json.zeek, line 4: from_json() requires a type argument (from_json([], 10, from_json_default_key_mapper))
+error in <...>/from_json.zeek, line 4: from_json() requires a type argument (from_json([], <internal>::#0, from_json_default_key_mapper))
diff --git a/testing/btest/Baseline.zam/core.option-runtime-errors-2/.stderr b/testing/btest/Baseline.zam/core.option-runtime-errors-2/.stderr
index 719b74fadc..15561eb6c9 100644
--- a/testing/btest/Baseline.zam/core.option-runtime-errors-2/.stderr
+++ b/testing/btest/Baseline.zam/core.option-runtime-errors-2/.stderr
@@ -1,2 +1,2 @@
 ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
-error in <...>/option-runtime-errors.zeek, line 3: Incompatible type for set of ID 'A': got 'string', need 'count' (Option::set(A, hi, ))
+error in <...>/option-runtime-errors.zeek, line 3: Incompatible type for set of ID 'A': got 'string', need 'count' (Option::set(A, <internal>::#0, ))
diff --git a/testing/btest/Baseline.zam/core.option-runtime-errors-3/.stderr b/testing/btest/Baseline.zam/core.option-runtime-errors-3/.stderr
index f121199a5d..682f1fbe27 100644
--- a/testing/btest/Baseline.zam/core.option-runtime-errors-3/.stderr
+++ b/testing/btest/Baseline.zam/core.option-runtime-errors-3/.stderr
@@ -1,2 +1,2 @@
 ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
-error in <...>/option-runtime-errors.zeek, line 3: ID 'A' is not an option (Option::set(A, 6, ))
+error in <...>/option-runtime-errors.zeek, line 3: ID 'A' is not an option (Option::set(A, <internal>::#0, ))
diff --git a/testing/btest/Baseline.zam/core.option-runtime-errors/.stderr b/testing/btest/Baseline.zam/core.option-runtime-errors/.stderr
index 7537f10f90..5e6d272614 100644
--- a/testing/btest/Baseline.zam/core.option-runtime-errors/.stderr
+++ b/testing/btest/Baseline.zam/core.option-runtime-errors/.stderr
@@ -1,2 +1,2 @@
 ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
-error in <...>/option-runtime-errors.zeek, line 9: Could not find ID named 'B' (Option::set(B, 6, ))
+error in <...>/option-runtime-errors.zeek, line 9: Could not find ID named 'B' (Option::set(B, <internal>::#0, ))