diff --git a/test_regress/t/t_array_type_methods.v b/test_regress/t/t_array_type_methods.v
index 80875aaf0..527cc6864 100644
--- a/test_regress/t/t_array_type_methods.v
+++ b/test_regress/t/t_array_type_methods.v
@@ -6,7 +6,7 @@
 
 `define stop $stop
 `define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d:  got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0);
-`define checks(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d:  got='%s' exp='%s'\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0);
+`define checks(gotv,expv) do if ((gotv) != (expv)) begin $write("%%Error: %s:%0d:  got='%s' exp='%s'\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0);
 
 module t (/*AUTOARG*/
    // Inputs
diff --git a/test_regress/t/t_assoc.v b/test_regress/t/t_assoc.v
index f6939b6c3..d1e6c12b5 100644
--- a/test_regress/t/t_assoc.v
+++ b/test_regress/t/t_assoc.v
@@ -6,8 +6,7 @@
 
 `define stop $stop
 `define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d:  got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0);
-`define checks(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d:  got='%s' exp='%s'\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0);
-`define checkg(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d:  got='%g' exp='%g'\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0);
+`define checks(gotv,expv) do if ((gotv) != (expv)) begin $write("%%Error: %s:%0d:  got='%s' exp='%s'\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0);
 `define checkp(gotv,expv_s) do begin string gotv_s; gotv_s = $sformatf("%p", gotv); if ((gotv_s) !== (expv_s)) begin $write("%%Error: %s:%0d:  got='%s' exp='%s'\n", `__FILE__,`__LINE__, (gotv_s), (expv_s)); `stop; end end while(0);
 
 module t (/*AUTOARG*/
diff --git a/test_regress/t/t_assoc2.v b/test_regress/t/t_assoc2.v
index 07a6dc6db..f3d03dcc2 100644
--- a/test_regress/t/t_assoc2.v
+++ b/test_regress/t/t_assoc2.v
@@ -6,8 +6,7 @@
 
 `define stop $stop
 `define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d:  got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0);
-`define checks(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d:  got='%s' exp='%s'\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0);
-`define checkg(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d:  got='%g' exp='%g'\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0);
+`define checks(gotv,expv) do if ((gotv) != (expv)) begin $write("%%Error: %s:%0d:  got='%s' exp='%s'\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0);
 
 module t (/*AUTOARG*/
    // Inputs
diff --git a/test_regress/t/t_assoc_wildcard.v b/test_regress/t/t_assoc_wildcard.v
index 8e67d841f..9469243b3 100644
--- a/test_regress/t/t_assoc_wildcard.v
+++ b/test_regress/t/t_assoc_wildcard.v
@@ -6,8 +6,7 @@
 
 `define stop $stop
 `define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d:  got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0);
-`define checks(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d:  got='%s' exp='%s'\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0);
-`define checkg(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d:  got='%g' exp='%g'\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0);
+`define checks(gotv,expv) do if ((gotv) != (expv)) begin $write("%%Error: %s:%0d:  got='%s' exp='%s'\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0);
 
 module t (/*AUTOARG*/
    // Inputs
diff --git a/test_regress/t/t_dynarray.v b/test_regress/t/t_dynarray.v
index 68d25c463..85221dbe4 100644
--- a/test_regress/t/t_dynarray.v
+++ b/test_regress/t/t_dynarray.v
@@ -6,7 +6,7 @@
 
 `define stop $stop
 `define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d:  got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0);
-`define checks(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d:  got='%s' exp='%s'\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0);
+`define checks(gotv,expv) do if ((gotv) != (expv)) begin $write("%%Error: %s:%0d:  got='%s' exp='%s'\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0);
 `define checkp(gotv,expv_s) do begin string gotv_s; gotv_s = $sformatf("%p", gotv); if ((gotv_s) !== (expv_s)) begin $write("%%Error: %s:%0d:  got='%s' exp='%s'\n", `__FILE__,`__LINE__, (gotv_s), (expv_s)); `stop; end end while(0);
 
 module t (/*AUTOARG*/
diff --git a/test_regress/t/t_dynarray_method.v b/test_regress/t/t_dynarray_method.v
index 290ef7d2b..c06fa9ab4 100644
--- a/test_regress/t/t_dynarray_method.v
+++ b/test_regress/t/t_dynarray_method.v
@@ -6,11 +6,9 @@
 
 `define stop $stop
 `define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d:  got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0);
-`define checks(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d:  got='%s' exp='%s'\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0);
+`define checks(gotv,expv) do if ((gotv) != (expv)) begin $write("%%Error: %s:%0d:  got='%s' exp='%s'\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0);
 `define checkp(gotv,expv_s) do begin string gotv_s; gotv_s = $sformatf("%p", gotv); if ((gotv_s) !== (expv_s)) begin $write("%%Error: %s:%0d:  got='%s' exp='%s'\n", `__FILE__,`__LINE__, (gotv_s), (expv_s)); `stop; end end while(0);
 
-`define checkg(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d:  got='%g' exp='%g'\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0);
-
 module t (/*AUTOARG*/);
 
    string s[] = { "hello", "sad", "sad", "world" };
diff --git a/test_regress/t/t_enum_huge_methods.v b/test_regress/t/t_enum_huge_methods.v
index 24bdbdba0..0c7e1de6d 100644
--- a/test_regress/t/t_enum_huge_methods.v
+++ b/test_regress/t/t_enum_huge_methods.v
@@ -6,7 +6,7 @@
 
 `define stop $stop
 `define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d:  got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0);
-`define checks(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d:  got='%s' exp='%s'\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0);
+`define checks(gotv,expv) do if ((gotv) != (expv)) begin $write("%%Error: %s:%0d:  got='%s' exp='%s'\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0);
 
 module t (/*AUTOARG*/
    // Inputs
diff --git a/test_regress/t/t_enum_large_methods.v b/test_regress/t/t_enum_large_methods.v
index ff9b69763..4ab01f2c9 100644
--- a/test_regress/t/t_enum_large_methods.v
+++ b/test_regress/t/t_enum_large_methods.v
@@ -6,7 +6,7 @@
 
 `define stop $stop
 `define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d:  got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0);
-`define checks(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d:  got='%s' exp='%s'\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0);
+`define checks(gotv,expv) do if ((gotv) != (expv)) begin $write("%%Error: %s:%0d:  got='%s' exp='%s'\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0);
 
 module t (/*AUTOARG*/
    // Inputs
diff --git a/test_regress/t/t_enum_type_methods.v b/test_regress/t/t_enum_type_methods.v
index 3b1d500f0..b391f659b 100644
--- a/test_regress/t/t_enum_type_methods.v
+++ b/test_regress/t/t_enum_type_methods.v
@@ -6,7 +6,7 @@
 
 `define stop $stop
 `define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d:  got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0);
-`define checks(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d:  got='%s' exp='%s'\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0);
+`define checks(gotv,expv) do if ((gotv) != (expv)) begin $write("%%Error: %s:%0d:  got='%s' exp='%s'\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0);
 
 module t (/*AUTOARG*/
    // Inputs
diff --git a/test_regress/t/t_math_real.v b/test_regress/t/t_math_real.v
index 3957d25a4..5e2344e5b 100644
--- a/test_regress/t/t_math_real.v
+++ b/test_regress/t/t_math_real.v
@@ -8,7 +8,7 @@
 
 `define stop $stop
 `define checkr(gotv,expv) do if ((gotv) != (expv)) begin $write("%%Error: %s:%0d:  got=%f exp=%f\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0);
-`define checks(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d:  got='%s' exp='%s'\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0);
+`define checks(gotv,expv) do if ((gotv) != (expv)) begin $write("%%Error: %s:%0d:  got='%s' exp='%s'\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0);
 `define is_near_real(a,b)  (( ((a)<(b)) ? (b)-(a) : (a)-(b)) < (((a)/(b))*0.0001))
 
 module t (/*AUTOARG*/
diff --git a/test_regress/t/t_mod_interface_array3.v b/test_regress/t/t_mod_interface_array3.v
index 354fd04a4..fa10f26ab 100644
--- a/test_regress/t/t_mod_interface_array3.v
+++ b/test_regress/t/t_mod_interface_array3.v
@@ -5,7 +5,7 @@
 // SPDX-License-Identifier: CC0-1.0
 
 `define stop $stop
-`define checks(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d:  got='%s' exp='%s'\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0);
+`define checks(gotv,expv) do if ((gotv) != (expv)) begin $write("%%Error: %s:%0d:  got='%s' exp='%s'\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0);
 
 interface a_if ();
    string s;
diff --git a/test_regress/t/t_nba_commit_queue.v b/test_regress/t/t_nba_commit_queue.v
index 527374cbe..632762b22 100644
--- a/test_regress/t/t_nba_commit_queue.v
+++ b/test_regress/t/t_nba_commit_queue.v
@@ -7,7 +7,7 @@
 `define stop $stop
 `define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d:  got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0)
 `define checkr(gotv,expv) do if ((gotv) != (expv)) begin $write("%%Error: %s:%0d:  got=%f exp=%f\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0);
-`define checks(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d:  got='%s' exp='%s'\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0);
+`define checks(gotv,expv) do if ((gotv) != (expv)) begin $write("%%Error: %s:%0d:  got='%s' exp='%s'\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0);
 
 
 
diff --git a/test_regress/t/t_queue.v b/test_regress/t/t_queue.v
index bfce2cef0..57a645f04 100644
--- a/test_regress/t/t_queue.v
+++ b/test_regress/t/t_queue.v
@@ -6,8 +6,7 @@
 
 `define stop $stop
 `define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d:  got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0);
-`define checks(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d:  got='%s' exp='%s'\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0);
-`define checkg(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d:  got='%g' exp='%g'\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0);
+`define checks(gotv,expv) do if ((gotv) != (expv)) begin $write("%%Error: %s:%0d:  got='%s' exp='%s'\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0);
 `define checkp(gotv,expv_s) do begin string gotv_s; gotv_s = $sformatf("%p", gotv); if ((gotv_s) !== (expv_s)) begin $write("%%Error: %s:%0d:  got='%s' exp='%s'\n", `__FILE__,`__LINE__, (gotv_s), (expv_s)); `stop; end end while(0);
 
 module t (/*AUTOARG*/
diff --git a/test_regress/t/t_queue_method.v b/test_regress/t/t_queue_method.v
index 88f8fb2c8..b8706db89 100644
--- a/test_regress/t/t_queue_method.v
+++ b/test_regress/t/t_queue_method.v
@@ -6,11 +6,9 @@
 
 `define stop $stop
 `define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d:  got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0);
-`define checks(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d:  got='%s' exp='%s'\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0);
+`define checks(gotv,expv) do if ((gotv) != (expv)) begin $write("%%Error: %s:%0d:  got='%s' exp='%s'\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0);
 `define checkp(gotv,expv_s) do begin string gotv_s; gotv_s = $sformatf("%p", gotv); if ((gotv_s) !== (expv_s)) begin $write("%%Error: %s:%0d:  got='%s' exp='%s'\n", `__FILE__,`__LINE__, (gotv_s), (expv_s)); `stop; end end while(0);
 
-`define checkg(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d:  got='%g' exp='%g'\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0);
-
 class Cls;
    int x;
    function new(int a);
diff --git a/test_regress/t/t_queue_pushpop.v b/test_regress/t/t_queue_pushpop.v
index acad0a3a2..94992c471 100644
--- a/test_regress/t/t_queue_pushpop.v
+++ b/test_regress/t/t_queue_pushpop.v
@@ -6,7 +6,7 @@
 
 `define stop $stop
 `define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d:  got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0);
-`define checks(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d:  got='%s' exp='%s'\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0);
+`define checks(gotv,expv) do if ((gotv) != (expv)) begin $write("%%Error: %s:%0d:  got='%s' exp='%s'\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0);
 
 module t (/*AUTOARG*/
    // Inputs
diff --git a/test_regress/t/t_queue_slice.v b/test_regress/t/t_queue_slice.v
index 88eb8b8a3..07ffa7139 100644
--- a/test_regress/t/t_queue_slice.v
+++ b/test_regress/t/t_queue_slice.v
@@ -6,7 +6,7 @@
 
 `define stop $stop
 `define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d:  got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0);
-`define checks(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d:  got='%s' exp='%s'\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0);
+`define checks(gotv,expv) do if ((gotv) != (expv)) begin $write("%%Error: %s:%0d:  got='%s' exp='%s'\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0);
 `define checkp(gotv,expv_s) do begin string gotv_s; gotv_s = $sformatf("%p", gotv); if ((gotv_s) !== (expv_s)) begin $write("%%Error: %s:%0d:  got='%s' exp='%s'\n", `__FILE__,`__LINE__, (gotv_s), (expv_s)); `stop; end end while(0);
 
 module t (/*AUTOARG*/);
diff --git a/test_regress/t/t_queue_unpacked.v b/test_regress/t/t_queue_unpacked.v
index 12ba2cc3b..30c3b41f9 100644
--- a/test_regress/t/t_queue_unpacked.v
+++ b/test_regress/t/t_queue_unpacked.v
@@ -5,7 +5,7 @@
 // SPDX-License-Identifier: CC0-1.0
 
 `define stop $stop
-`define checks(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d:  got='%s' exp='%s'\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0);
+`define checks(gotv,expv) do if ((gotv) != (expv)) begin $write("%%Error: %s:%0d:  got='%s' exp='%s'\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0);
 
 module t (/*AUTOARG*/);
 
diff --git a/test_regress/t/t_stream_unpack_wider.v b/test_regress/t/t_stream_unpack_wider.v
index 94b522875..e3c5643ed 100644
--- a/test_regress/t/t_stream_unpack_wider.v
+++ b/test_regress/t/t_stream_unpack_wider.v
@@ -6,7 +6,7 @@
 
 `define stop $stop
 `define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d:  got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0);
-`define checks(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d:  got='%s' exp='%s'\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0);
+`define checks(gotv,expv) do if ((gotv) != (expv)) begin $write("%%Error: %s:%0d:  got='%s' exp='%s'\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0);
 
 module t (/*AUTOARG*/);
    initial begin
diff --git a/test_regress/t/t_string_type_methods.v b/test_regress/t/t_string_type_methods.v
index 7884f4a47..603706cd3 100644
--- a/test_regress/t/t_string_type_methods.v
+++ b/test_regress/t/t_string_type_methods.v
@@ -6,8 +6,8 @@
 
 `define stop $stop
 `define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d:  got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0);
-`define checks(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d:  got='%s' exp='%s'\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0);
-`define checkg(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d:  got='%g' exp='%g'\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0);
+`define checks(gotv,expv) do if ((gotv) != (expv)) begin $write("%%Error: %s:%0d:  got='%s' exp='%s'\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0);
+`define checkg(gotv,expv) do if ((gotv) != (expv)) begin $write("%%Error: %s:%0d:  got='%g' exp='%g'\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0);
 
 module t (/*AUTOARG*/
    // Inputs
diff --git a/test_regress/t/t_struct_unpacked.v b/test_regress/t/t_struct_unpacked.v
index ca22982bf..8008016a9 100644
--- a/test_regress/t/t_struct_unpacked.v
+++ b/test_regress/t/t_struct_unpacked.v
@@ -5,7 +5,7 @@
 // SPDX-License-Identifier: CC0-1.0
 
 `define stop $stop
-`define checks(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d:  got='%s' exp='%s'\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0);
+`define checks(gotv,expv) do if ((gotv) != (expv)) begin $write("%%Error: %s:%0d:  got='%s' exp='%s'\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0);
 `define checkp(gotv,expv_s) do begin string gotv_s; gotv_s = $sformatf("%p", gotv); if ((gotv_s) !== (expv_s)) begin $write("%%Error: %s:%0d:  got='%s' exp='%s'\n", `__FILE__,`__LINE__, (gotv_s), (expv_s)); `stop; end end while(0);
 
 class Cls;
diff --git a/test_regress/t/t_sys_file_basic.v b/test_regress/t/t_sys_file_basic.v
index bdd84128d..762c765d9 100644
--- a/test_regress/t/t_sys_file_basic.v
+++ b/test_regress/t/t_sys_file_basic.v
@@ -9,7 +9,7 @@
 `define stop $stop
 `define checkr(gotv,expv) do if (`ratio_error((gotv),(expv))>0.0001) begin $write("%%Error: %s:%0d:  got=%f exp=%f\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0);
 `define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d:  got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0);
-`define checks(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d:  got='%s' exp='%s'\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0);
+`define checks(gotv,expv) do if ((gotv) != (expv)) begin $write("%%Error: %s:%0d:  got='%s' exp='%s'\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0);
 
 module t;
    integer file;
diff --git a/test_regress/t/t_typename_min.v b/test_regress/t/t_typename_min.v
index d497283f2..8d39ce5cc 100644
--- a/test_regress/t/t_typename_min.v
+++ b/test_regress/t/t_typename_min.v
@@ -5,7 +5,7 @@
 // SPDX-License-Identifier: CC0-1.0
 
 `define stop $stop
-`define checks(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d:  got='%s' exp='%s'\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0);
+`define checks(gotv,expv) do if ((gotv) != (expv)) begin $write("%%Error: %s:%0d:  got='%s' exp='%s'\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0);
 
 module t;
    int unsigned array[3] = {1, 2, 3};
diff --git a/test_regress/t/t_xml_debugcheck.out b/test_regress/t/t_xml_debugcheck.out
index 2132c3998..7fbe9bc78 100644
--- a/test_regress/t/t_xml_debugcheck.out
+++ b/test_regress/t/t_xml_debugcheck.out
@@ -61,7 +61,7 @@
         <creset loc="d,52,17,52,18">
           <varref loc="d,52,17,52,18" name="t.unnamedblk1.e" dtype_id="2"/>
         </creset>
-        <var loc="d,49,123,49,127" name="__Vtemp_1" dtype_id="10" vartype="string" origName="__Vtemp_1"/>
+        <var loc="d,49,122,49,126" name="__Vtemp_1" dtype_id="10" vartype="string" origName="__Vtemp_1"/>
         <assign loc="d,32,9,32,10" dtype_id="11">
           <const loc="d,32,11,32,14" name="4&apos;h3" dtype_id="11"/>
           <varref loc="d,32,7,32,8" name="t.e" dtype_id="11"/>
@@ -487,8 +487,8 @@
           </begin>
         </if>
         <if loc="d,49,10,49,12">
-          <neqn loc="d,49,23,49,26" dtype_id="9">
-            <const loc="d,49,28,49,33" name="&quot;E03&quot;" dtype_id="10"/>
+          <neqn loc="d,49,23,49,25" dtype_id="9">
+            <const loc="d,49,27,49,32" name="&quot;E03&quot;" dtype_id="10"/>
             <arraysel loc="d,49,17,49,21" dtype_id="10">
               <varref loc="d,17,12,17,16" name="__Venumtab_enum_name2" dtype_id="16"/>
               <and loc="d,49,17,49,21" dtype_id="13">
@@ -500,24 +500,24 @@
             </arraysel>
           </neqn>
           <begin>
-            <assign loc="d,49,123,49,127" dtype_id="10">
-              <arraysel loc="d,49,123,49,127" dtype_id="10">
+            <assign loc="d,49,122,49,126" dtype_id="10">
+              <arraysel loc="d,49,122,49,126" dtype_id="10">
                 <varref loc="d,17,12,17,16" name="__Venumtab_enum_name2" dtype_id="16"/>
-                <and loc="d,49,123,49,127" dtype_id="13">
-                  <const loc="d,49,123,49,127" name="32&apos;h7" dtype_id="14"/>
-                  <ccast loc="d,49,121,49,122" dtype_id="13">
-                    <varref loc="d,49,121,49,122" name="t.e" dtype_id="13"/>
+                <and loc="d,49,122,49,126" dtype_id="13">
+                  <const loc="d,49,122,49,126" name="32&apos;h7" dtype_id="14"/>
+                  <ccast loc="d,49,120,49,121" dtype_id="13">
+                    <varref loc="d,49,120,49,121" name="t.e" dtype_id="13"/>
                   </ccast>
                 </and>
               </arraysel>
-              <varref loc="d,49,123,49,127" name="__Vtemp_1" dtype_id="10"/>
+              <varref loc="d,49,122,49,126" name="__Vtemp_1" dtype_id="10"/>
             </assign>
-            <display loc="d,49,42,49,48" displaytype="$write">
-              <sformatf loc="d,49,42,49,48" name="%%Error: t/t_enum_type_methods.v:49:  got=&apos;%@&apos; exp=&apos;E03&apos;&#10;" dtype_id="10">
-                <varref loc="d,49,123,49,127" name="__Vtemp_1" dtype_id="10"/>
+            <display loc="d,49,41,49,47" displaytype="$write">
+              <sformatf loc="d,49,41,49,47" name="%%Error: t/t_enum_type_methods.v:49:  got=&apos;%@&apos; exp=&apos;E03&apos;&#10;" dtype_id="10">
+                <varref loc="d,49,122,49,126" name="__Vtemp_1" dtype_id="10"/>
               </sformatf>
             </display>
-            <stop loc="d,49,140,49,145"/>
+            <stop loc="d,49,139,49,144"/>
           </begin>
         </if>
         <assign loc="d,51,11,51,12" dtype_id="10">
@@ -585,17 +585,17 @@
           <varref loc="d,56,7,56,10" name="t.all" dtype_id="10"/>
         </assign>
         <if loc="d,57,10,57,12">
-          <neqn loc="d,57,20,57,23" dtype_id="9">
-            <const loc="d,57,25,57,36" name="&quot;E01E03E04&quot;" dtype_id="10"/>
+          <neqn loc="d,57,20,57,22" dtype_id="9">
+            <const loc="d,57,24,57,35" name="&quot;E01E03E04&quot;" dtype_id="10"/>
             <varref loc="d,57,15,57,18" name="t.all" dtype_id="10"/>
           </neqn>
           <begin>
-            <display loc="d,57,45,57,51" displaytype="$write">
-              <sformatf loc="d,57,45,57,51" name="%%Error: t/t_enum_type_methods.v:57:  got=&apos;%@&apos; exp=&apos;E01E03E04&apos;&#10;" dtype_id="10">
-                <varref loc="d,57,124,57,127" name="t.all" dtype_id="10"/>
+            <display loc="d,57,44,57,50" displaytype="$write">
+              <sformatf loc="d,57,44,57,50" name="%%Error: t/t_enum_type_methods.v:57:  got=&apos;%@&apos; exp=&apos;E01E03E04&apos;&#10;" dtype_id="10">
+                <varref loc="d,57,123,57,126" name="t.all" dtype_id="10"/>
               </sformatf>
             </display>
-            <stop loc="d,57,146,57,151"/>
+            <stop loc="d,57,145,57,150"/>
           </begin>
         </if>
       </cfunc>
@@ -712,9 +712,9 @@
         <creset loc="d,24,9,24,10">
           <varref loc="d,24,9,24,10" name="__Vdly__t.e" dtype_id="2"/>
         </creset>
-        <var loc="d,68,126,68,130" name="__Vtemp_1" dtype_id="10" vartype="string" origName="__Vtemp_1"/>
-        <var loc="d,78,126,78,130" name="__Vtemp_2" dtype_id="10" vartype="string" origName="__Vtemp_2"/>
-        <var loc="d,88,126,88,130" name="__Vtemp_3" dtype_id="10" vartype="string" origName="__Vtemp_3"/>
+        <var loc="d,68,125,68,129" name="__Vtemp_1" dtype_id="10" vartype="string" origName="__Vtemp_1"/>
+        <var loc="d,78,125,78,129" name="__Vtemp_2" dtype_id="10" vartype="string" origName="__Vtemp_2"/>
+        <var loc="d,88,125,88,129" name="__Vtemp_3" dtype_id="10" vartype="string" origName="__Vtemp_3"/>
         <assignpre loc="d,65,10,65,11" dtype_id="11">
           <varref loc="d,65,10,65,11" name="t.e" dtype_id="11"/>
           <varref loc="d,65,10,65,11" name="__Vdly__t.e" dtype_id="11"/>
@@ -751,8 +751,8 @@
               </eq>
               <begin>
                 <if loc="d,68,13,68,15">
-                  <neqn loc="d,68,26,68,29" dtype_id="9">
-                    <const loc="d,68,31,68,36" name="&quot;E01&quot;" dtype_id="10"/>
+                  <neqn loc="d,68,26,68,28" dtype_id="9">
+                    <const loc="d,68,30,68,35" name="&quot;E01&quot;" dtype_id="10"/>
                     <arraysel loc="d,68,20,68,24" dtype_id="10">
                       <varref loc="d,17,12,17,16" name="__Venumtab_enum_name2" dtype_id="16"/>
                       <and loc="d,68,20,68,24" dtype_id="13">
@@ -764,24 +764,24 @@
                     </arraysel>
                   </neqn>
                   <begin>
-                    <assign loc="d,68,126,68,130" dtype_id="10">
-                      <arraysel loc="d,68,126,68,130" dtype_id="10">
+                    <assign loc="d,68,125,68,129" dtype_id="10">
+                      <arraysel loc="d,68,125,68,129" dtype_id="10">
                         <varref loc="d,17,12,17,16" name="__Venumtab_enum_name2" dtype_id="16"/>
-                        <and loc="d,68,126,68,130" dtype_id="13">
-                          <const loc="d,68,126,68,130" name="32&apos;h7" dtype_id="14"/>
-                          <ccast loc="d,68,124,68,125" dtype_id="13">
-                            <varref loc="d,68,124,68,125" name="t.e" dtype_id="13"/>
+                        <and loc="d,68,125,68,129" dtype_id="13">
+                          <const loc="d,68,125,68,129" name="32&apos;h7" dtype_id="14"/>
+                          <ccast loc="d,68,123,68,124" dtype_id="13">
+                            <varref loc="d,68,123,68,124" name="t.e" dtype_id="13"/>
                           </ccast>
                         </and>
                       </arraysel>
-                      <varref loc="d,68,126,68,130" name="__Vtemp_1" dtype_id="10"/>
+                      <varref loc="d,68,125,68,129" name="__Vtemp_1" dtype_id="10"/>
                     </assign>
-                    <display loc="d,68,45,68,51" displaytype="$write">
-                      <sformatf loc="d,68,45,68,51" name="%%Error: t/t_enum_type_methods.v:68:  got=&apos;%@&apos; exp=&apos;E01&apos;&#10;" dtype_id="10">
-                        <varref loc="d,68,126,68,130" name="__Vtemp_1" dtype_id="10"/>
+                    <display loc="d,68,44,68,50" displaytype="$write">
+                      <sformatf loc="d,68,44,68,50" name="%%Error: t/t_enum_type_methods.v:68:  got=&apos;%@&apos; exp=&apos;E01&apos;&#10;" dtype_id="10">
+                        <varref loc="d,68,125,68,129" name="__Vtemp_1" dtype_id="10"/>
                       </sformatf>
                     </display>
-                    <stop loc="d,68,143,68,148"/>
+                    <stop loc="d,68,142,68,147"/>
                   </begin>
                 </if>
                 <if loc="d,69,13,69,15">
@@ -1001,8 +1001,8 @@
                   </eq>
                   <begin>
                     <if loc="d,78,13,78,15">
-                      <neqn loc="d,78,26,78,29" dtype_id="9">
-                        <const loc="d,78,31,78,36" name="&quot;E03&quot;" dtype_id="10"/>
+                      <neqn loc="d,78,26,78,28" dtype_id="9">
+                        <const loc="d,78,30,78,35" name="&quot;E03&quot;" dtype_id="10"/>
                         <arraysel loc="d,78,20,78,24" dtype_id="10">
                           <varref loc="d,17,12,17,16" name="__Venumtab_enum_name2" dtype_id="16"/>
                           <and loc="d,78,20,78,24" dtype_id="13">
@@ -1014,24 +1014,24 @@
                         </arraysel>
                       </neqn>
                       <begin>
-                        <assign loc="d,78,126,78,130" dtype_id="10">
-                          <arraysel loc="d,78,126,78,130" dtype_id="10">
+                        <assign loc="d,78,125,78,129" dtype_id="10">
+                          <arraysel loc="d,78,125,78,129" dtype_id="10">
                             <varref loc="d,17,12,17,16" name="__Venumtab_enum_name2" dtype_id="16"/>
-                            <and loc="d,78,126,78,130" dtype_id="13">
-                              <const loc="d,78,126,78,130" name="32&apos;h7" dtype_id="14"/>
-                              <ccast loc="d,78,124,78,125" dtype_id="13">
-                                <varref loc="d,78,124,78,125" name="t.e" dtype_id="13"/>
+                            <and loc="d,78,125,78,129" dtype_id="13">
+                              <const loc="d,78,125,78,129" name="32&apos;h7" dtype_id="14"/>
+                              <ccast loc="d,78,123,78,124" dtype_id="13">
+                                <varref loc="d,78,123,78,124" name="t.e" dtype_id="13"/>
                               </ccast>
                             </and>
                           </arraysel>
-                          <varref loc="d,78,126,78,130" name="__Vtemp_2" dtype_id="10"/>
+                          <varref loc="d,78,125,78,129" name="__Vtemp_2" dtype_id="10"/>
                         </assign>
-                        <display loc="d,78,45,78,51" displaytype="$write">
-                          <sformatf loc="d,78,45,78,51" name="%%Error: t/t_enum_type_methods.v:78:  got=&apos;%@&apos; exp=&apos;E03&apos;&#10;" dtype_id="10">
-                            <varref loc="d,78,126,78,130" name="__Vtemp_2" dtype_id="10"/>
+                        <display loc="d,78,44,78,50" displaytype="$write">
+                          <sformatf loc="d,78,44,78,50" name="%%Error: t/t_enum_type_methods.v:78:  got=&apos;%@&apos; exp=&apos;E03&apos;&#10;" dtype_id="10">
+                            <varref loc="d,78,125,78,129" name="__Vtemp_2" dtype_id="10"/>
                           </sformatf>
                         </display>
-                        <stop loc="d,78,143,78,148"/>
+                        <stop loc="d,78,142,78,147"/>
                       </begin>
                     </if>
                     <if loc="d,79,13,79,15">
@@ -1251,8 +1251,8 @@
                       </eq>
                       <begin>
                         <if loc="d,88,13,88,15">
-                          <neqn loc="d,88,26,88,29" dtype_id="9">
-                            <const loc="d,88,31,88,36" name="&quot;E04&quot;" dtype_id="10"/>
+                          <neqn loc="d,88,26,88,28" dtype_id="9">
+                            <const loc="d,88,30,88,35" name="&quot;E04&quot;" dtype_id="10"/>
                             <arraysel loc="d,88,20,88,24" dtype_id="10">
                               <varref loc="d,17,12,17,16" name="__Venumtab_enum_name2" dtype_id="16"/>
                               <and loc="d,88,20,88,24" dtype_id="13">
@@ -1264,24 +1264,24 @@
                             </arraysel>
                           </neqn>
                           <begin>
-                            <assign loc="d,88,126,88,130" dtype_id="10">
-                              <arraysel loc="d,88,126,88,130" dtype_id="10">
+                            <assign loc="d,88,125,88,129" dtype_id="10">
+                              <arraysel loc="d,88,125,88,129" dtype_id="10">
                                 <varref loc="d,17,12,17,16" name="__Venumtab_enum_name2" dtype_id="16"/>
-                                <and loc="d,88,126,88,130" dtype_id="13">
-                                  <const loc="d,88,126,88,130" name="32&apos;h7" dtype_id="14"/>
-                                  <ccast loc="d,88,124,88,125" dtype_id="13">
-                                    <varref loc="d,88,124,88,125" name="t.e" dtype_id="13"/>
+                                <and loc="d,88,125,88,129" dtype_id="13">
+                                  <const loc="d,88,125,88,129" name="32&apos;h7" dtype_id="14"/>
+                                  <ccast loc="d,88,123,88,124" dtype_id="13">
+                                    <varref loc="d,88,123,88,124" name="t.e" dtype_id="13"/>
                                   </ccast>
                                 </and>
                               </arraysel>
-                              <varref loc="d,88,126,88,130" name="__Vtemp_3" dtype_id="10"/>
+                              <varref loc="d,88,125,88,129" name="__Vtemp_3" dtype_id="10"/>
                             </assign>
-                            <display loc="d,88,45,88,51" displaytype="$write">
-                              <sformatf loc="d,88,45,88,51" name="%%Error: t/t_enum_type_methods.v:88:  got=&apos;%@&apos; exp=&apos;E04&apos;&#10;" dtype_id="10">
-                                <varref loc="d,88,126,88,130" name="__Vtemp_3" dtype_id="10"/>
+                            <display loc="d,88,44,88,50" displaytype="$write">
+                              <sformatf loc="d,88,44,88,50" name="%%Error: t/t_enum_type_methods.v:88:  got=&apos;%@&apos; exp=&apos;E04&apos;&#10;" dtype_id="10">
+                                <varref loc="d,88,125,88,129" name="__Vtemp_3" dtype_id="10"/>
                               </sformatf>
                             </display>
-                            <stop loc="d,88,143,88,148"/>
+                            <stop loc="d,88,142,88,147"/>
                           </begin>
                         </if>
                         <if loc="d,89,13,89,15">