diff --git a/test_regress/t/t_alw_noreorder.pl b/test_regress/t/t_alw_noreorder.pl
index 8abf7379a..c77549922 100755
--- a/test_regress/t/t_alw_noreorder.pl
+++ b/test_regress/t/t_alw_noreorder.pl
@@ -15,13 +15,13 @@ compile(
     verilator_flags2 => ["--stats -fno-reorder"],
     );
 
-file_grep($Self->{stats}, qr/Optimizations, Split always\s+(\d+)/i, 0);
+file_grep($Self->{stats}, qr/Optimizations, Split always\s+(\d+)/, 0);
 # Here we should see some dly vars since reorder is disabled.
 # (Whereas our twin test, t_alw_reorder, should see no dly vars
 #  since it enables the reorder step.)
 my @files = glob_all("$Self->{obj_dir}/$Self->{vm_prefix}___024root*.cpp");
-file_grep_any(\@files, qr/dly__t__DOT__v1/i);
-file_grep_any(\@files, qr/dly__t__DOT__v2/i);
+file_grep_any(\@files, qr/dly__t__DOT__v1/);
+file_grep_any(\@files, qr/dly__t__DOT__v2/);
 
 execute(
     );
diff --git a/test_regress/t/t_alw_nosplit.pl b/test_regress/t/t_alw_nosplit.pl
index a68458f8a..8bc2c80e2 100755
--- a/test_regress/t/t_alw_nosplit.pl
+++ b/test_regress/t/t_alw_nosplit.pl
@@ -15,7 +15,7 @@ compile(
     );
 
 if ($Self->{vlt_all}) {
-    file_grep($Self->{stats}, qr/Optimizations, Split always\s+(\d+)/i, 0);
+    file_grep($Self->{stats}, qr/Optimizations, Split always\s+(\d+)/, 0);
 }
 
 execute(
diff --git a/test_regress/t/t_alw_reorder.pl b/test_regress/t/t_alw_reorder.pl
index d85c6c0b1..31a6b80c9 100755
--- a/test_regress/t/t_alw_reorder.pl
+++ b/test_regress/t/t_alw_reorder.pl
@@ -14,7 +14,7 @@ compile(
     verilator_flags2 => ["--stats"],
     );
 
-file_grep($Self->{stats}, qr/Optimizations, Split always\s+(\d+)/i, 0);
+file_grep($Self->{stats}, qr/Optimizations, Split always\s+(\d+)/, 0);
 # Important: if reorder succeeded, we should see no dly vars.
 # Equally important: twin test t_alw_noreorder should see dly vars,
 #  is identical to this test except for disabling the reorder step.
@@ -22,9 +22,9 @@ foreach my $file (
       glob_all("$Self->{obj_dir}/$Self->{vm_prefix}*.h"),
       glob_all("$Self->{obj_dir}/$Self->{vm_prefix}*.cpp")
     ) {
-    file_grep_not($file, qr/dly__t__DOT__v1/i);
-    file_grep_not($file, qr/dly__t__DOT__v2/i);
-    file_grep_not($file, qr/dly__t__DOT__v3/i);
+    file_grep_not($file, qr/dly__t__DOT__v1/);
+    file_grep_not($file, qr/dly__t__DOT__v2/);
+    file_grep_not($file, qr/dly__t__DOT__v3/);
 }
 
 execute(
diff --git a/test_regress/t/t_alw_split.pl b/test_regress/t/t_alw_split.pl
index cb4dfc774..082357d85 100755
--- a/test_regress/t/t_alw_split.pl
+++ b/test_regress/t/t_alw_split.pl
@@ -15,7 +15,7 @@ compile(
     );
 
 if ($Self->{vlt_all}) {
-    file_grep($Self->{stats}, qr/Optimizations, Split always\s+(\d+)/i, 4);
+    file_grep($Self->{stats}, qr/Optimizations, Split always\s+(\d+)/, 4);
 }
 
 execute(
diff --git a/test_regress/t/t_alw_split_rst.pl b/test_regress/t/t_alw_split_rst.pl
index bb1e2063d..19a8ccb53 100755
--- a/test_regress/t/t_alw_split_rst.pl
+++ b/test_regress/t/t_alw_split_rst.pl
@@ -16,7 +16,7 @@ compile(
     );
 
 if ($Self->{vlt_all}) {
-    file_grep($Self->{stats}, qr/Optimizations, Split always\s+(\d+)/i, 12);
+    file_grep($Self->{stats}, qr/Optimizations, Split always\s+(\d+)/, 12);
 }
 
 execute(
diff --git a/test_regress/t/t_alw_splitord.pl b/test_regress/t/t_alw_splitord.pl
index bd50751c8..89d592cbf 100755
--- a/test_regress/t/t_alw_splitord.pl
+++ b/test_regress/t/t_alw_splitord.pl
@@ -15,7 +15,7 @@ compile(
     );
 
 if ($Self->{vlt_all}) {
-    file_grep($Self->{stats}, qr/Optimizations, Split always\s+(\d+)/i, 5);
+    file_grep($Self->{stats}, qr/Optimizations, Split always\s+(\d+)/, 5);
 }
 
 execute(
diff --git a/test_regress/t/t_assigndly_dynamic_nofork.pl b/test_regress/t/t_assigndly_dynamic_nofork.pl
index b4872e54c..f3611f5c0 100755
--- a/test_regress/t/t_assigndly_dynamic_nofork.pl
+++ b/test_regress/t/t_assigndly_dynamic_nofork.pl
@@ -20,7 +20,7 @@ foreach my $file (
       glob_all("$Self->{obj_dir}/$Self->{vm_prefix}*.h"),
       glob_all("$Self->{obj_dir}/$Self->{vm_prefix}*.cpp")
     ) {
-    file_grep_not($file, qr/__Vfork_/i);
+    file_grep_not($file, qr/__Vfork_/);
 }
 
 ok(1);
diff --git a/test_regress/t/t_case_huge.pl b/test_regress/t/t_case_huge.pl
index 321e44916..a3d78fffd 100755
--- a/test_regress/t/t_case_huge.pl
+++ b/test_regress/t/t_case_huge.pl
@@ -15,11 +15,11 @@ compile(
     );
 
 if ($Self->{vlt}) {
-    file_grep($Self->{stats}, qr/Optimizations, Tables created\s+(\d+)/i, 10);
-    file_grep($Self->{stats}, qr/Optimizations, Combined CFuncs\s+(\d+)/i, 8);
+    file_grep($Self->{stats}, qr/Optimizations, Tables created\s+(\d+)/, 10);
+    file_grep($Self->{stats}, qr/Optimizations, Combined CFuncs\s+(\d+)/, 8);
 } elsif ($Self->{vltmt}) {
-    file_grep($Self->{stats}, qr/Optimizations, Tables created\s+(\d+)/i, 10);
-    file_grep($Self->{stats}, qr/Optimizations, Combined CFuncs\s+(\d+)/i, 9);
+    file_grep($Self->{stats}, qr/Optimizations, Tables created\s+(\d+)/, 10);
+    file_grep($Self->{stats}, qr/Optimizations, Combined CFuncs\s+(\d+)/, 9);
 }
 
 execute(
diff --git a/test_regress/t/t_cellarray.pl b/test_regress/t/t_cellarray.pl
index 391da448e..8bc9f4cab 100755
--- a/test_regress/t/t_cellarray.pl
+++ b/test_regress/t/t_cellarray.pl
@@ -18,7 +18,7 @@ execute(
     );
 
 if ($Self->{vlt_all}) {
-    file_grep($Self->{stats}, qr/Optimizations, Gate assign merged\s+(\d+)/i, 28);
+    file_grep($Self->{stats}, qr/Optimizations, Gate assign merged\s+(\d+)/, 28);
 }
 
 ok(1);
diff --git a/test_regress/t/t_clk_gater.pl b/test_regress/t/t_clk_gater.pl
index 4dc92f16a..8aa5977f9 100755
--- a/test_regress/t/t_clk_gater.pl
+++ b/test_regress/t/t_clk_gater.pl
@@ -20,7 +20,7 @@ execute(
 
 if ($Self->{vlt_all}) {
     #Optimization is disabled
-    #file_grep ($Self->{stats}, qr/Optimizations, Gaters inserted\s+(\d+)/i, 3);
+    #file_grep ($Self->{stats}, qr/Optimizations, Gaters inserted\s+(\d+)/, 3);
 }
 
 ok(1);
diff --git a/test_regress/t/t_const_opt.pl b/test_regress/t/t_const_opt.pl
index 711fc7b9c..20198090d 100755
--- a/test_regress/t/t_const_opt.pl
+++ b/test_regress/t/t_const_opt.pl
@@ -19,7 +19,7 @@ execute(
     );
 
 if ($Self->{vlt}) {
-    file_grep($Self->{stats}, qr/Optimizations, Const bit op reduction\s+(\d+)/i, 45);
+    file_grep($Self->{stats}, qr/Optimizations, Const bit op reduction\s+(\d+)/, 45);
 }
 ok(1);
 1;
diff --git a/test_regress/t/t_const_opt_cov.pl b/test_regress/t/t_const_opt_cov.pl
index 23e5e5c69..16d9e379a 100755
--- a/test_regress/t/t_const_opt_cov.pl
+++ b/test_regress/t/t_const_opt_cov.pl
@@ -18,7 +18,7 @@ execute(
     );
 
 if ($Self->{vlt}) {
-    file_grep($Self->{stats}, qr/Optimizations, Const bit op reduction\s+(\d+)/i, 144);
+    file_grep($Self->{stats}, qr/Optimizations, Const bit op reduction\s+(\d+)/, 144);
 }
 
 ok(1);
diff --git a/test_regress/t/t_const_opt_dfg.pl b/test_regress/t/t_const_opt_dfg.pl
index bdaa3c347..6cc14eede 100755
--- a/test_regress/t/t_const_opt_dfg.pl
+++ b/test_regress/t/t_const_opt_dfg.pl
@@ -20,7 +20,7 @@ execute(
     );
 
 if ($Self->{vlt}) {
-    file_grep($Self->{stats}, qr/Optimizations, Const bit op reduction\s+(\d+)/i, 40);
+    file_grep($Self->{stats}, qr/Optimizations, Const bit op reduction\s+(\d+)/, 40);
 }
 ok(1);
 1;
diff --git a/test_regress/t/t_const_opt_no_expand.pl b/test_regress/t/t_const_opt_no_expand.pl
index 554ed650d..6170fbc47 100755
--- a/test_regress/t/t_const_opt_no_expand.pl
+++ b/test_regress/t/t_const_opt_no_expand.pl
@@ -20,7 +20,7 @@ execute(
     );
 
 if ($Self->{vlt}) {
-    file_grep($Self->{stats}, qr/Optimizations, Const bit op reduction\s+(\d+)/i, 1);
+    file_grep($Self->{stats}, qr/Optimizations, Const bit op reduction\s+(\d+)/, 1);
 }
 ok(1);
 1;
diff --git a/test_regress/t/t_const_opt_red.pl b/test_regress/t/t_const_opt_red.pl
index 32678fd4e..ea300f7e8 100755
--- a/test_regress/t/t_const_opt_red.pl
+++ b/test_regress/t/t_const_opt_red.pl
@@ -18,7 +18,7 @@ execute(
     );
 
 if ($Self->{vlt}) {
-    file_grep($Self->{stats}, qr/Optimizations, Const bit op reduction\s+(\d+)/i, 158);
+    file_grep($Self->{stats}, qr/Optimizations, Const bit op reduction\s+(\d+)/, 158);
 }
 
 ok(1);
diff --git a/test_regress/t/t_cover_toggle.pl b/test_regress/t/t_cover_toggle.pl
index 1f7c29076..061221eb5 100755
--- a/test_regress/t/t_cover_toggle.pl
+++ b/test_regress/t/t_cover_toggle.pl
@@ -22,7 +22,7 @@ inline_checks();
 
 file_grep_not("$Self->{obj_dir}/coverage.dat", "largeish");
 
-file_grep($Self->{stats}, qr/Coverage, Toggle points joined\s+(\d+)/i, 23)
+file_grep($Self->{stats}, qr/Coverage, Toggle points joined\s+(\d+)/, 23)
     if $Self->{vlt_all};
 
 run(cmd => ["$ENV{VERILATOR_ROOT}/bin/verilator_coverage",
diff --git a/test_regress/t/t_dedupe_clk_gate.pl b/test_regress/t/t_dedupe_clk_gate.pl
index a82d856ba..f8f612945 100755
--- a/test_regress/t/t_dedupe_clk_gate.pl
+++ b/test_regress/t/t_dedupe_clk_gate.pl
@@ -18,7 +18,7 @@ compile(
 
 if ($Self->{vlt_all}) {
     file_grep("$out_filename", qr/{"type":"VAR","name":"t.f0.clock_gate.clken_latched","addr":"[^"]*","loc":"\w,44:[^"]*","dtypep":"\(\w+\)",.*"origName":"clken_latched",.*"isLatched":true,.*"dtypeName":"logic"/);
-    file_grep($Self->{stats}, qr/Optimizations, Gate sigs deduped\s+(\d+)/i, 4);
+    file_grep($Self->{stats}, qr/Optimizations, Gate sigs deduped\s+(\d+)/, 4);
 }
 
 ok(1);
diff --git a/test_regress/t/t_dedupe_seq_logic.pl b/test_regress/t/t_dedupe_seq_logic.pl
index e6f7ecd72..4a7c2af27 100755
--- a/test_regress/t/t_dedupe_seq_logic.pl
+++ b/test_regress/t/t_dedupe_seq_logic.pl
@@ -15,7 +15,7 @@ compile(
     );
 
 if ($Self->{vlt_all}) {
-    file_grep($Self->{stats}, qr/Optimizations, Gate sigs deduped\s+(\d+)/i, 6);
+    file_grep($Self->{stats}, qr/Optimizations, Gate sigs deduped\s+(\d+)/, 6);
 }
 
 ok(1);
diff --git a/test_regress/t/t_dfg_peephole.pl b/test_regress/t/t_dfg_peephole.pl
index 381d1c017..2017b0d09 100755
--- a/test_regress/t/t_dfg_peephole.pl
+++ b/test_regress/t/t_dfg_peephole.pl
@@ -86,7 +86,7 @@ if (!-r "$root/.git") {
       my $name = shift;
       $name = lc $name;
       $name =~ s/_/ /g;
-      file_grep("$Self->{obj_dir}/obj_opt/Vopt__stats.txt", qr/DFG\s+(pre|post) inline Peephole, ${name}\s+([1-9]\d*)/i);
+      file_grep("$Self->{obj_dir}/obj_opt/Vopt__stats.txt", qr/DFG\s+(pre|post) inline Peephole, ${name}\s+([1-9]\d*)/);
     }
 
     # Check all optimizations defined in
diff --git a/test_regress/t/t_dfg_unhandled.pl b/test_regress/t/t_dfg_unhandled.pl
index f37a397d3..f728d1ac4 100755
--- a/test_regress/t/t_dfg_unhandled.pl
+++ b/test_regress/t/t_dfg_unhandled.pl
@@ -14,7 +14,7 @@ compile(
     verilator_flags2 => ["--stats"],
     );
 
-file_grep($Self->{stats}, qr/Optimizations, DFG pre inline Ast2Dfg, non-representable \(impure\)\s+(\d+)/i, 1);
+file_grep($Self->{stats}, qr/Optimizations, DFG pre inline Ast2Dfg, non-representable \(impure\)\s+(\d+)/, 1);
 
 ok(1);
 1;
diff --git a/test_regress/t/t_do_not_convert_to_comb.pl b/test_regress/t/t_do_not_convert_to_comb.pl
index c6db81d38..0e3a18189 100755
--- a/test_regress/t/t_do_not_convert_to_comb.pl
+++ b/test_regress/t/t_do_not_convert_to_comb.pl
@@ -15,7 +15,7 @@ compile(
     );
 
 # We must not convert these blocks into combinational blocks
-file_grep($Self->{stats}, qr/Scheduling, size of class: combinational\s+(\d+)/i, 0);
+file_grep($Self->{stats}, qr/Scheduling, size of class: combinational\s+(\d+)/, 0);
 
 ok(1);
 1;
diff --git a/test_regress/t/t_extract_static_const.pl b/test_regress/t/t_extract_static_const.pl
index 5859a52b7..e871384b7 100755
--- a/test_regress/t/t_extract_static_const.pl
+++ b/test_regress/t/t_extract_static_const.pl
@@ -19,9 +19,9 @@ execute(
     );
 
 if ($Self->{vlt_all}) {
-    file_grep($Self->{stats}, qr/Optimizations, Prelim extracted value to ConstPool\s+(\d+)/i,
+    file_grep($Self->{stats}, qr/Optimizations, Prelim extracted value to ConstPool\s+(\d+)/,
               8);
-    file_grep($Self->{stats}, qr/ConstPool, Constants emitted\s+(\d+)/i,
+    file_grep($Self->{stats}, qr/ConstPool, Constants emitted\s+(\d+)/,
               1);
 }
 
diff --git a/test_regress/t/t_extract_static_const_multimodule.pl b/test_regress/t/t_extract_static_const_multimodule.pl
index 5859a52b7..e871384b7 100755
--- a/test_regress/t/t_extract_static_const_multimodule.pl
+++ b/test_regress/t/t_extract_static_const_multimodule.pl
@@ -19,9 +19,9 @@ execute(
     );
 
 if ($Self->{vlt_all}) {
-    file_grep($Self->{stats}, qr/Optimizations, Prelim extracted value to ConstPool\s+(\d+)/i,
+    file_grep($Self->{stats}, qr/Optimizations, Prelim extracted value to ConstPool\s+(\d+)/,
               8);
-    file_grep($Self->{stats}, qr/ConstPool, Constants emitted\s+(\d+)/i,
+    file_grep($Self->{stats}, qr/ConstPool, Constants emitted\s+(\d+)/,
               1);
 }
 
diff --git a/test_regress/t/t_extract_static_const_no_merge.pl b/test_regress/t/t_extract_static_const_no_merge.pl
index e3868bd64..19e77ecd7 100755
--- a/test_regress/t/t_extract_static_const_no_merge.pl
+++ b/test_regress/t/t_extract_static_const_no_merge.pl
@@ -22,9 +22,9 @@ execute(
     );
 
 if ($Self->{vlt_all}) {
-    file_grep($Self->{stats}, qr/Optimizations, Prelim extracted value to ConstPool\s+(\d+)/i,
+    file_grep($Self->{stats}, qr/Optimizations, Prelim extracted value to ConstPool\s+(\d+)/,
               8);
-    file_grep($Self->{stats}, qr/ConstPool, Constants emitted\s+(\d+)/i,
+    file_grep($Self->{stats}, qr/ConstPool, Constants emitted\s+(\d+)/,
               2);
 }
 
diff --git a/test_regress/t/t_flag_comp_limit_parens.pl b/test_regress/t/t_flag_comp_limit_parens.pl
index 6e6e0add2..c387b0eba 100755
--- a/test_regress/t/t_flag_comp_limit_parens.pl
+++ b/test_regress/t/t_flag_comp_limit_parens.pl
@@ -18,7 +18,7 @@ execute(
     );
 
 my @files = glob_all("$Self->{obj_dir}/$Self->{vm_prefix}___024root__DepSet*__Slow.cpp");
-file_grep_any(\@files, qr/Vdeeptemp/i);
+file_grep_any(\@files, qr/Vdeeptemp/);
 
 ok(1);
 1;
diff --git a/test_regress/t/t_flag_expand_limit.pl b/test_regress/t/t_flag_expand_limit.pl
index 4bbbb8f4e..4616430cb 100755
--- a/test_regress/t/t_flag_expand_limit.pl
+++ b/test_regress/t/t_flag_expand_limit.pl
@@ -14,7 +14,7 @@ compile(
     verilator_flags2 => ['--expand-limit 1 --stats -fno-dfg'],
     );
 
-file_grep($Self->{stats}, qr/Optimizations, expand limited\s+(\d+)/i, 3);
+file_grep($Self->{stats}, qr/Optimizations, expand limited\s+(\d+)/, 3);
 
 ok(1);
 1;
diff --git a/test_regress/t/t_flag_help.pl b/test_regress/t/t_flag_help.pl
index 274c8d40d..e7d501820 100755
--- a/test_regress/t/t_flag_help.pl
+++ b/test_regress/t/t_flag_help.pl
@@ -27,7 +27,7 @@ sub check {
         verilator_run => 1,
         );
 
-    file_grep($logfile, qr/(DISTRIBUTION|usage:)/i);
+    file_grep($logfile, qr/(DISTRIBUTION|usage:)/);
 }
 
 check("perl", "$ENV{VERILATOR_ROOT}/bin/verilator");
diff --git a/test_regress/t/t_flag_mmd.pl b/test_regress/t/t_flag_mmd.pl
index 7f2955642..be72328d3 100755
--- a/test_regress/t/t_flag_mmd.pl
+++ b/test_regress/t/t_flag_mmd.pl
@@ -14,7 +14,7 @@ compile(
     verilator_flags2 => ["-MMD -MP"],
     );
 
-file_grep("$Self->{obj_dir}/Vt_flag_mmd__ver.d", qr!t/t_flag_mmd.v!x);
+file_grep("$Self->{obj_dir}/Vt_flag_mmd__ver.d", qr!t/t_flag_mmd.v!);
 
 ok(1);
 1;
diff --git a/test_regress/t/t_flag_quiet_stats.pl b/test_regress/t/t_flag_quiet_stats.pl
index eb7961c00..81590297b 100755
--- a/test_regress/t/t_flag_quiet_stats.pl
+++ b/test_regress/t/t_flag_quiet_stats.pl
@@ -16,7 +16,7 @@ compile(
     logfile => $Self->{run_log_filename},
     );
 
-file_grep_not($Self->{obj_dir}.'/vlt_compile.log', qr/V e r i l a t/i,);
+file_grep_not($Self->{obj_dir}.'/vlt_compile.log', qr/V e r i l a t/);
 
 ok(1);
 1;
diff --git a/test_regress/t/t_flag_quiet_stats2.pl b/test_regress/t/t_flag_quiet_stats2.pl
index 5a87e9df8..1f62cf14a 100755
--- a/test_regress/t/t_flag_quiet_stats2.pl
+++ b/test_regress/t/t_flag_quiet_stats2.pl
@@ -18,7 +18,7 @@ compile(
     logfile => $Self->{run_log_filename},
     );
 
-file_grep_not($Self->{obj_dir}.'/vlt_compile.log', qr/V e r i l a t/i,);
+file_grep_not($Self->{obj_dir}.'/vlt_compile.log', qr/V e r i l a t/);
 
 ok(1);
 1;
diff --git a/test_regress/t/t_flag_quiet_stats3.pl b/test_regress/t/t_flag_quiet_stats3.pl
index f7e7580a5..514e31bf5 100755
--- a/test_regress/t/t_flag_quiet_stats3.pl
+++ b/test_regress/t/t_flag_quiet_stats3.pl
@@ -18,7 +18,7 @@ compile(
     logfile => $Self->{run_log_filename},
     );
 
-file_grep($Self->{obj_dir}.'/vlt_compile.log', qr/V e r i l a t/i,);
+file_grep($Self->{obj_dir}.'/vlt_compile.log', qr/V e r i l a t/);
 
 ok(1);
 1;
diff --git a/test_regress/t/t_func_crc.pl b/test_regress/t/t_func_crc.pl
index fef50e7d2..80d0232b8 100755
--- a/test_regress/t/t_func_crc.pl
+++ b/test_regress/t/t_func_crc.pl
@@ -18,7 +18,7 @@ execute(
     );
 
 if ($Self->{vlt}) {
-    file_grep($Self->{stats}, qr/Optimizations, Const bit op reduction\s+(\d+)/i, 3888);
+    file_grep($Self->{stats}, qr/Optimizations, Const bit op reduction\s+(\d+)/, 3888);
 }
 
 ok(1);
diff --git a/test_regress/t/t_func_dotted_inl1.pl b/test_regress/t/t_func_dotted_inl1.pl
index 0a4dd35ff..2f9bc0a1c 100755
--- a/test_regress/t/t_func_dotted_inl1.pl
+++ b/test_regress/t/t_func_dotted_inl1.pl
@@ -18,9 +18,9 @@ compile(
     );
 
 if ($Self->{vlt_all}) {
-    file_grep_not("$out_filename", qr/"ma0"/i);
-    file_grep_not("$out_filename", qr/"mb0"/i);
-    file_grep_not("$out_filename", qr/"mc0"/i);
+    file_grep_not("$out_filename", qr/"ma0"/);
+    file_grep_not("$out_filename", qr/"mb0"/);
+    file_grep_not("$out_filename", qr/"mc0"/);
 }
 
 execute(
diff --git a/test_regress/t/t_func_dotted_inl1_vlt.pl b/test_regress/t/t_func_dotted_inl1_vlt.pl
index 19febb752..25e67c1c4 100755
--- a/test_regress/t/t_func_dotted_inl1_vlt.pl
+++ b/test_regress/t/t_func_dotted_inl1_vlt.pl
@@ -18,9 +18,9 @@ compile(
     );
 
 if ($Self->{vlt_all}) {
-    file_grep_not("$out_filename", qr/"ma0"/i);
-    file_grep_not("$out_filename", qr/"mb0"/i);
-    file_grep_not("$out_filename", qr/"mc0"/i);
+    file_grep_not("$out_filename", qr/"ma0"/);
+    file_grep_not("$out_filename", qr/"mb0"/);
+    file_grep_not("$out_filename", qr/"mc0"/);
 }
 
 execute(
diff --git a/test_regress/t/t_func_real_exprstmt.pl b/test_regress/t/t_func_real_exprstmt.pl
index 41cb7bc65..496700b88 100755
--- a/test_regress/t/t_func_real_exprstmt.pl
+++ b/test_regress/t/t_func_real_exprstmt.pl
@@ -16,7 +16,7 @@ compile(
 
 if ($Self->{vlt_all}) {
     # Check no EXPRSTMTs in final output - should get optimized away
-    file_grep_not($Self->{stats}, qr/Node count, EXPRSTMT/i);
+    file_grep_not($Self->{stats}, qr/Node count, EXPRSTMT/);
 }
 
 execute(
diff --git a/test_regress/t/t_gantt.pl b/test_regress/t/t_gantt.pl
index f3240b330..d9cc88ff7 100755
--- a/test_regress/t/t_gantt.pl
+++ b/test_regress/t/t_gantt.pl
@@ -42,15 +42,15 @@ run(cmd => ["$ENV{VERILATOR_ROOT}/bin/verilator_gantt",
     );
 
 if ($Self->{vltmt}) {
-    file_grep("$Self->{obj_dir}/gantt.log", qr/Total threads += 2/i);
-    file_grep("$Self->{obj_dir}/gantt.log", qr/Total mtasks += 7/i);
+    file_grep("$Self->{obj_dir}/gantt.log", qr/Total threads += 2/);
+    file_grep("$Self->{obj_dir}/gantt.log", qr/Total mtasks += 7/);
     # Predicted thread utilization should be less than 100%
-    file_grep_not("$Self->{obj_dir}/gantt.log", qr/Thread utilization =\s*\d\d\d+\.\d+%/i);
+    file_grep_not("$Self->{obj_dir}/gantt.log", qr/Thread utilization =\s*\d\d\d+\.\d+%/);
 } else {
-    file_grep("$Self->{obj_dir}/gantt.log", qr/Total threads += 1/i);
-    file_grep("$Self->{obj_dir}/gantt.log", qr/Total mtasks += 0/i);
+    file_grep("$Self->{obj_dir}/gantt.log", qr/Total threads += 1/);
+    file_grep("$Self->{obj_dir}/gantt.log", qr/Total mtasks += 0/);
 }
-file_grep("$Self->{obj_dir}/gantt.log", qr/\|\s+2\s+\|\s+2\.0+\s+\|\s+eval/i);
+file_grep("$Self->{obj_dir}/gantt.log", qr/\|\s+2\s+\|\s+2\.0+\s+\|\s+eval/);
 
 # Diff to itself, just to check parsing
 vcd_identical("$Self->{obj_dir}/profile_exec.vcd", "$Self->{obj_dir}/profile_exec.vcd");
diff --git a/test_regress/t/t_gantt_two.pl b/test_regress/t/t_gantt_two.pl
index 38fc1ff74..2aa8a4670 100755
--- a/test_regress/t/t_gantt_two.pl
+++ b/test_regress/t/t_gantt_two.pl
@@ -47,13 +47,13 @@ run(cmd => ["$ENV{VERILATOR_ROOT}/bin/verilator_gantt",
     );
 
 if ($Self->{vltmt}) {
-    file_grep("$Self->{obj_dir}/gantt.log", qr/Total threads += 2/i);
-    file_grep("$Self->{obj_dir}/gantt.log", qr/Total mtasks += 7/i);
+    file_grep("$Self->{obj_dir}/gantt.log", qr/Total threads += 2/);
+    file_grep("$Self->{obj_dir}/gantt.log", qr/Total mtasks += 7/);
 } else {
-    file_grep("$Self->{obj_dir}/gantt.log", qr/Total threads += 1/i);
-    file_grep("$Self->{obj_dir}/gantt.log", qr/Total mtasks += 0/i);
+    file_grep("$Self->{obj_dir}/gantt.log", qr/Total threads += 1/);
+    file_grep("$Self->{obj_dir}/gantt.log", qr/Total mtasks += 0/);
 }
-file_grep("$Self->{obj_dir}/gantt.log", qr/\|\s+4\s+\|\s+4\.0+\s+\|\s+eval/i);
+file_grep("$Self->{obj_dir}/gantt.log", qr/\|\s+4\s+\|\s+4\.0+\s+\|\s+eval/);
 
 # Diff to itself, just to check parsing
 vcd_identical("$Self->{obj_dir}/profile_exec.vcd", "$Self->{obj_dir}/profile_exec.vcd");
diff --git a/test_regress/t/t_gate_chained.pl b/test_regress/t/t_gate_chained.pl
index 68225753a..d218e3a12 100755
--- a/test_regress/t/t_gate_chained.pl
+++ b/test_regress/t/t_gate_chained.pl
@@ -53,7 +53,7 @@ execute(
     );
 
 # Must be <<9000 above to prove this worked
-file_grep($Self->{stats}, qr/Optimizations, Gate sigs deleted\s+(\d+)/i, 8575);
+file_grep($Self->{stats}, qr/Optimizations, Gate sigs deleted\s+(\d+)/, 8575);
 
 ok(1);
 1;
diff --git a/test_regress/t/t_gate_ormux.pl b/test_regress/t/t_gate_ormux.pl
index 3f5118673..4cef31d51 100755
--- a/test_regress/t/t_gate_ormux.pl
+++ b/test_regress/t/t_gate_ormux.pl
@@ -19,7 +19,7 @@ compile(
     );
 
 if ($Self->{vlt}) {
-    file_grep($Self->{stats}, qr/Optimizations, Const bit op reduction\s+(\d+)/i, 1058);
+    file_grep($Self->{stats}, qr/Optimizations, Const bit op reduction\s+(\d+)/, 1058);
 }
 
 execute(
diff --git a/test_regress/t/t_hier_block.pl b/test_regress/t/t_hier_block.pl
index c96232c50..a0a39a46c 100755
--- a/test_regress/t/t_hier_block.pl
+++ b/test_regress/t/t_hier_block.pl
@@ -30,12 +30,12 @@ compile(
 execute(
     );
 
-file_grep($Self->{obj_dir} . "/Vsub0/sub0.sv", qr/^\s+\/\/\s+timeprecision\s+(\d+)ps;/mi, 1);
+file_grep($Self->{obj_dir} . "/Vsub0/sub0.sv", qr/^\s+\/\/\s+timeprecision\s+(\d+)ps;/m, 1);
 file_grep($Self->{obj_dir} . "/Vsub0/sub0.sv", /^module\s+(\S+)\s+/, "sub0");
 file_grep($Self->{obj_dir} . "/Vsub1/sub1.sv", /^module\s+(\S+)\s+/, "sub1");
 file_grep($Self->{obj_dir} . "/Vsub2/sub2.sv", /^module\s+(\S+)\s+/, "sub2");
-file_grep($Self->{stats}, qr/HierBlock,\s+Hierarchical blocks\s+(\d+)/i, 14);
-file_grep($Self->{run_log_filename}, qr/MACRO:(\S+) is defined/i, "cplusplus");
+file_grep($Self->{stats}, qr/HierBlock,\s+Hierarchical blocks\s+(\d+)/, 14);
+file_grep($Self->{run_log_filename}, qr/MACRO:(\S+) is defined/, "cplusplus");
 
 ok(1);
 1;
diff --git a/test_regress/t/t_hier_block_cmake.pl b/test_regress/t/t_hier_block_cmake.pl
index c815fb6c9..9034257fd 100755
--- a/test_regress/t/t_hier_block_cmake.pl
+++ b/test_regress/t/t_hier_block_cmake.pl
@@ -36,8 +36,8 @@ if (!$Self->have_cmake) {
     file_grep($target_dir . 'Vsub0/sub0.sv', /^module\s+(\S+)\s+/, "sub0");
     file_grep($target_dir . 'Vsub1/sub1.sv', /^module\s+(\S+)\s+/, "sub1");
     file_grep($target_dir . 'Vsub2/sub2.sv', /^module\s+(\S+)\s+/, "sub2");
-    file_grep($target_dir . 'Vt_hier_block__stats.txt', qr/HierBlock,\s+Hierarchical blocks\s+(\d+)/i, 14);
-    file_grep($Self->{obj_dir} . '/run.log', qr/MACRO:(\S+) is defined/i, "cplusplus");
+    file_grep($target_dir . 'Vt_hier_block__stats.txt', qr/HierBlock,\s+Hierarchical blocks\s+(\d+)/, 14);
+    file_grep($Self->{obj_dir} . '/run.log', qr/MACRO:(\S+) is defined/, "cplusplus");
 }
 
 ok(1);
diff --git a/test_regress/t/t_hier_block_nohier.pl b/test_regress/t/t_hier_block_nohier.pl
index f925c7a57..06814d334 100755
--- a/test_regress/t/t_hier_block_nohier.pl
+++ b/test_regress/t/t_hier_block_nohier.pl
@@ -31,8 +31,8 @@ compile(
 execute(
     );
 
-file_grep_not($Self->{stats}, qr/HierBlock,\s+Hierarchical blocks\s+(\d+)/i);
-file_grep($Self->{run_log_filename}, qr/MACRO:(\S+) is defined/i, "cplusplus");
+file_grep_not($Self->{stats}, qr/HierBlock,\s+Hierarchical blocks\s+(\d+)/);
+file_grep($Self->{run_log_filename}, qr/MACRO:(\S+) is defined/, "cplusplus");
 
 ok(1);
 1;
diff --git a/test_regress/t/t_hier_block_prot_lib.pl b/test_regress/t/t_hier_block_prot_lib.pl
index 69ce46bec..675ac65f5 100755
--- a/test_regress/t/t_hier_block_prot_lib.pl
+++ b/test_regress/t/t_hier_block_prot_lib.pl
@@ -59,7 +59,7 @@ while (1) {
 file_grep($secret_dir . "/Vsub0/sub0.sv", /^module\s+(\S+)\s+/, "sub0");
 file_grep($secret_dir . "/Vsub1/sub1.sv", /^module\s+(\S+)\s+/, "sub1");
 file_grep($secret_dir . "/Vsub2/sub2.sv", /^module\s+(\S+)\s+/, "sub2");
-file_grep($Self->{run_log_filename}, qr/MACRO:(\S+) is defined/i, "cplusplus");
+file_grep($Self->{run_log_filename}, qr/MACRO:(\S+) is defined/, "cplusplus");
 
 ok(1);
 1;
diff --git a/test_regress/t/t_hier_block_prot_lib_shared.pl b/test_regress/t/t_hier_block_prot_lib_shared.pl
index 6db16b000..516904426 100755
--- a/test_regress/t/t_hier_block_prot_lib_shared.pl
+++ b/test_regress/t/t_hier_block_prot_lib_shared.pl
@@ -61,7 +61,7 @@ while (1) {
 file_grep($secret_dir . "/Vsub0/sub0.sv", /^module\s+(\S+)\s+/, "sub0");
 file_grep($secret_dir . "/Vsub1/sub1.sv", /^module\s+(\S+)\s+/, "sub1");
 file_grep($secret_dir . "/Vsub2/sub2.sv", /^module\s+(\S+)\s+/, "sub2");
-file_grep($Self->{run_log_filename}, qr/MACRO:(\S+) is defined/i, "cplusplus");
+file_grep($Self->{run_log_filename}, qr/MACRO:(\S+) is defined/, "cplusplus");
 
 ok(1);
 1;
diff --git a/test_regress/t/t_hier_block_sc.pl b/test_regress/t/t_hier_block_sc.pl
index 56d33a200..b0023b4b7 100755
--- a/test_regress/t/t_hier_block_sc.pl
+++ b/test_regress/t/t_hier_block_sc.pl
@@ -34,8 +34,8 @@ execute(
 file_grep($Self->{obj_dir} . "/Vsub0/sub0.sv", /^module\s+(\S+)\s+/, "sub0");
 file_grep($Self->{obj_dir} . "/Vsub1/sub1.sv", /^module\s+(\S+)\s+/, "sub1");
 file_grep($Self->{obj_dir} . "/Vsub2/sub2.sv", /^module\s+(\S+)\s+/, "sub2");
-file_grep($Self->{stats}, qr/HierBlock,\s+Hierarchical blocks\s+(\d+)/i, 14);
-file_grep($Self->{run_log_filename}, qr/MACRO:(\S+) is defined/i, "cplusplus");
+file_grep($Self->{stats}, qr/HierBlock,\s+Hierarchical blocks\s+(\d+)/, 14);
+file_grep($Self->{run_log_filename}, qr/MACRO:(\S+) is defined/, "cplusplus");
 
 ok(1);
 1;
diff --git a/test_regress/t/t_hier_block_sc_trace_fst.pl b/test_regress/t/t_hier_block_sc_trace_fst.pl
index f4ff711fd..4234811c7 100755
--- a/test_regress/t/t_hier_block_sc_trace_fst.pl
+++ b/test_regress/t/t_hier_block_sc_trace_fst.pl
@@ -36,8 +36,8 @@ execute(
 file_grep($Self->{obj_dir} . "/Vsub0/sub0.sv", /^module\s+(\S+)\s+/, "sub0");
 file_grep($Self->{obj_dir} . "/Vsub1/sub1.sv", /^module\s+(\S+)\s+/, "sub1");
 file_grep($Self->{obj_dir} . "/Vsub2/sub2.sv", /^module\s+(\S+)\s+/, "sub2");
-file_grep($Self->{stats}, qr/HierBlock,\s+Hierarchical blocks\s+(\d+)/i, 14);
-file_grep($Self->{run_log_filename}, qr/MACRO:(\S+) is defined/i, "cplusplus");
+file_grep($Self->{stats}, qr/HierBlock,\s+Hierarchical blocks\s+(\d+)/, 14);
+file_grep($Self->{run_log_filename}, qr/MACRO:(\S+) is defined/, "cplusplus");
 
 fst_identical($Self->trace_filename, $Self->{golden_filename});
 ok(1);
diff --git a/test_regress/t/t_hier_block_sc_trace_vcd.pl b/test_regress/t/t_hier_block_sc_trace_vcd.pl
index 34ccf7ff9..ccd49a671 100755
--- a/test_regress/t/t_hier_block_sc_trace_vcd.pl
+++ b/test_regress/t/t_hier_block_sc_trace_vcd.pl
@@ -36,8 +36,8 @@ execute(
 file_grep($Self->{obj_dir} . "/Vsub0/sub0.sv", /^module\s+(\S+)\s+/, "sub0");
 file_grep($Self->{obj_dir} . "/Vsub1/sub1.sv", /^module\s+(\S+)\s+/, "sub1");
 file_grep($Self->{obj_dir} . "/Vsub2/sub2.sv", /^module\s+(\S+)\s+/, "sub2");
-file_grep($Self->{stats}, qr/HierBlock,\s+Hierarchical blocks\s+(\d+)/i, 14);
-file_grep($Self->{run_log_filename}, qr/MACRO:(\S+) is defined/i, "cplusplus");
+file_grep($Self->{stats}, qr/HierBlock,\s+Hierarchical blocks\s+(\d+)/, 14);
+file_grep($Self->{run_log_filename}, qr/MACRO:(\S+) is defined/, "cplusplus");
 
 vcd_identical($Self->trace_filename, $Self->{golden_filename});
 ok(1);
diff --git a/test_regress/t/t_hier_block_signed_logic.pl b/test_regress/t/t_hier_block_signed_logic.pl
index e86cbde94..230264176 100755
--- a/test_regress/t/t_hier_block_signed_logic.pl
+++ b/test_regress/t/t_hier_block_signed_logic.pl
@@ -18,6 +18,6 @@ execute(
     );
 
 file_grep($Self->{obj_dir} . "/Vsub/sub.sv", /^module\s+(\S+)\s+/, "sub");
-file_grep($Self->{stats}, qr/HierBlock,\s+Hierarchical blocks\s+(\d+)/i, 1);
+file_grep($Self->{stats}, qr/HierBlock,\s+Hierarchical blocks\s+(\d+)/, 1);
 
 ok(1);
diff --git a/test_regress/t/t_hier_block_vlt.pl b/test_regress/t/t_hier_block_vlt.pl
index 40db2e09c..12e21bc38 100755
--- a/test_regress/t/t_hier_block_vlt.pl
+++ b/test_regress/t/t_hier_block_vlt.pl
@@ -34,8 +34,8 @@ file_grep($Self->{obj_dir} . "/Vsub0/sub0.sv", qr/^\s+timeprecision\s+(\d+)ps;/m
 file_grep($Self->{obj_dir} . "/Vsub0/sub0.sv", /^module\s+(\S+)\s+/, "sub0");
 file_grep($Self->{obj_dir} . "/Vsub1/sub1.sv", /^module\s+(\S+)\s+/, "sub1");
 file_grep($Self->{obj_dir} . "/Vsub2/sub2.sv", /^module\s+(\S+)\s+/, "sub2");
-file_grep($Self->{stats}, qr/HierBlock,\s+Hierarchical blocks\s+(\d+)/i, 14);
-file_grep($Self->{run_log_filename}, qr/MACRO:(\S+) is defined/i, "cplusplus");
+file_grep($Self->{stats}, qr/HierBlock,\s+Hierarchical blocks\s+(\d+)/, 14);
+file_grep($Self->{run_log_filename}, qr/MACRO:(\S+) is defined/, "cplusplus");
 
 ok(1);
 1;
diff --git a/test_regress/t/t_inst_tree_inl0_pub1.pl b/test_regress/t/t_inst_tree_inl0_pub1.pl
index 6b88297cb..897de0083 100755
--- a/test_regress/t/t_inst_tree_inl0_pub1.pl
+++ b/test_regress/t/t_inst_tree_inl0_pub1.pl
@@ -41,7 +41,7 @@ sub checkRelativeRefs {
 if ($Self->{vlt_all}) {
     # We expect to combine sequent functions across multiple instances of
     # l2, l3, l4, l5. If this number drops, please confirm this has not broken.
-    file_grep($Self->{stats}, qr/Optimizations, Combined CFuncs\s+(\d+)/i,
+    file_grep($Self->{stats}, qr/Optimizations, Combined CFuncs\s+(\d+)/,
               ($Self->{vltmt} ? 85 : 67));
 
     # Everything should use relative references
diff --git a/test_regress/t/t_mem_shift.pl b/test_regress/t/t_mem_shift.pl
index 49f0cd03d..b6026e614 100755
--- a/test_regress/t/t_mem_shift.pl
+++ b/test_regress/t/t_mem_shift.pl
@@ -15,7 +15,7 @@ compile(
     );
 
 if ($Self->{vlt_all}) {
-    file_grep($Self->{stats}, qr/Optimizations, Delayed shared-sets\s+(\d+)/i, 14);
+    file_grep($Self->{stats}, qr/Optimizations, Delayed shared-sets\s+(\d+)/, 14);
 }
 
 execute(
diff --git a/test_regress/t/t_merge_cond.pl b/test_regress/t/t_merge_cond.pl
index 2443c7542..9af7b64ee 100755
--- a/test_regress/t/t_merge_cond.pl
+++ b/test_regress/t/t_merge_cond.pl
@@ -19,11 +19,11 @@ execute(
 
 if ($Self->{vlt}) {
     # Note, with vltmt this might be split differently, so only checking vlt
-    file_grep($Self->{stats}, qr/Optimizations, MergeCond merges\s+(\d+)/i,
+    file_grep($Self->{stats}, qr/Optimizations, MergeCond merges\s+(\d+)/,
               9);
-    file_grep($Self->{stats}, qr/Optimizations, MergeCond merged items\s+(\d+)/i,
+    file_grep($Self->{stats}, qr/Optimizations, MergeCond merged items\s+(\d+)/,
               580);
-    file_grep($Self->{stats}, qr/Optimizations, MergeCond longest merge\s+(\d+)/i,
+    file_grep($Self->{stats}, qr/Optimizations, MergeCond longest merge\s+(\d+)/,
               128);
 }
 
diff --git a/test_regress/t/t_merge_cond_blowup.pl b/test_regress/t/t_merge_cond_blowup.pl
index 5a295e02e..bda5fd2d7 100755
--- a/test_regress/t/t_merge_cond_blowup.pl
+++ b/test_regress/t/t_merge_cond_blowup.pl
@@ -21,11 +21,11 @@ execute(
 
 if ($Self->{vlt}) {
     # Note, with vltmt this might be split differently, so only checking vlt
-    file_grep($Self->{stats}, qr/Optimizations, MergeCond merges\s+(\d+)/i,
+    file_grep($Self->{stats}, qr/Optimizations, MergeCond merges\s+(\d+)/,
               500);   # V3MergeCond.cpp MAX_DISTANCE
-    file_grep($Self->{stats}, qr/Optimizations, MergeCond merged items\s+(\d+)/i,
+    file_grep($Self->{stats}, qr/Optimizations, MergeCond merged items\s+(\d+)/,
               1000);  # V3MergeCond.cpp MAX_DISTANCE *2
-    file_grep($Self->{stats}, qr/Optimizations, MergeCond longest merge\s+(\d+)/i,
+    file_grep($Self->{stats}, qr/Optimizations, MergeCond longest merge\s+(\d+)/,
               2);
 }
 
diff --git a/test_regress/t/t_merge_cond_bug_3409.pl b/test_regress/t/t_merge_cond_bug_3409.pl
index bb6c1fab4..6a407de6a 100755
--- a/test_regress/t/t_merge_cond_bug_3409.pl
+++ b/test_regress/t/t_merge_cond_bug_3409.pl
@@ -17,11 +17,11 @@ compile(
 execute();
 
 if ($Self->{vlt_all}) {
-    file_grep($Self->{stats}, qr/Optimizations, MergeCond merges\s+(\d+)/i,
+    file_grep($Self->{stats}, qr/Optimizations, MergeCond merges\s+(\d+)/,
               0);
-    file_grep($Self->{stats}, qr/Optimizations, MergeCond merged items\s+(\d+)/i,
+    file_grep($Self->{stats}, qr/Optimizations, MergeCond merged items\s+(\d+)/,
               0);
-    file_grep($Self->{stats}, qr/Optimizations, MergeCond longest merge\s+(\d+)/i,
+    file_grep($Self->{stats}, qr/Optimizations, MergeCond longest merge\s+(\d+)/,
               0);
 }
 
diff --git a/test_regress/t/t_merge_cond_no_extend.pl b/test_regress/t/t_merge_cond_no_extend.pl
index 5fd0b644e..41393c3bd 100755
--- a/test_regress/t/t_merge_cond_no_extend.pl
+++ b/test_regress/t/t_merge_cond_no_extend.pl
@@ -14,7 +14,7 @@ compile(
     verilator_flags2 => ["--stats"],
     );
 
-file_grep($Self->{stats}, qr/Optimizations, MergeCond merges\s+(\d+)/i, 0);
+file_grep($Self->{stats}, qr/Optimizations, MergeCond merges\s+(\d+)/, 0);
 
 ok(1);
 1;
diff --git a/test_regress/t/t_merge_cond_no_motion.pl b/test_regress/t/t_merge_cond_no_motion.pl
index c2252dbf2..f2a9b4f23 100755
--- a/test_regress/t/t_merge_cond_no_motion.pl
+++ b/test_regress/t/t_merge_cond_no_motion.pl
@@ -21,11 +21,11 @@ execute(
 
 if ($Self->{vlt}) {
     # Note, with vltmt this might be split differently, so only checking vlt
-    file_grep($Self->{stats}, qr/Optimizations, MergeCond merges\s+(\d+)/i,
+    file_grep($Self->{stats}, qr/Optimizations, MergeCond merges\s+(\d+)/,
               10);
-    file_grep($Self->{stats}, qr/Optimizations, MergeCond merged items\s+(\d+)/i,
+    file_grep($Self->{stats}, qr/Optimizations, MergeCond merged items\s+(\d+)/,
               580);
-    file_grep($Self->{stats}, qr/Optimizations, MergeCond longest merge\s+(\d+)/i,
+    file_grep($Self->{stats}, qr/Optimizations, MergeCond longest merge\s+(\d+)/,
               64);
 }
 
diff --git a/test_regress/t/t_nba_commit_queue.pl b/test_regress/t/t_nba_commit_queue.pl
index 23732a814..04eaa131e 100755
--- a/test_regress/t/t_nba_commit_queue.pl
+++ b/test_regress/t/t_nba_commit_queue.pl
@@ -17,9 +17,9 @@ compile(
 execute(
     );
 
-file_grep($Self->{stats}, qr/Dynamic NBA, variables needing commit queue without partial updates\s+(\d+)/i,
+file_grep($Self->{stats}, qr/Dynamic NBA, variables needing commit queue without partial updates\s+(\d+)/,
           6);
-file_grep($Self->{stats}, qr/Dynamic NBA, variables needing commit queue with partial updates\s+(\d+)/i,
+file_grep($Self->{stats}, qr/Dynamic NBA, variables needing commit queue with partial updates\s+(\d+)/,
           3);
 
 ok(1);
diff --git a/test_regress/t/t_opt_dead.pl b/test_regress/t/t_opt_dead.pl
index fe3cb7eec..cf4dd74fb 100755
--- a/test_regress/t/t_opt_dead.pl
+++ b/test_regress/t/t_opt_dead.pl
@@ -18,8 +18,8 @@ execute(
 
 # bug2227, Verilator unsupported, class dead
 # This is what we really want:
-#   file_grep_not("$Self->{obj_dir}/V$Self->{name}__Syms.h", qr/dead/ix);
-file_grep("$Self->{obj_dir}/V$Self->{name}__Syms.h", qr/dead/ix);
+#   file_grep_not("$Self->{obj_dir}/V$Self->{name}__Syms.h", qr/dead/);
+file_grep("$Self->{obj_dir}/V$Self->{name}__Syms.h", qr/dead/);
 
 ok(1);
 1;
diff --git a/test_regress/t/t_opt_dead_noassigns.pl b/test_regress/t/t_opt_dead_noassigns.pl
index 8ee53e043..62206e42e 100755
--- a/test_regress/t/t_opt_dead_noassigns.pl
+++ b/test_regress/t/t_opt_dead_noassigns.pl
@@ -18,7 +18,7 @@ execute(
     );
 
 my @files = glob_all("$Self->{obj_dir}/$Self->{vm_prefix}_*.cpp");
-file_grep_any(\@files, qr/keptdead/ix);
+file_grep_any(\@files, qr/keptdead/);
 
 ok(1);
 1;
diff --git a/test_regress/t/t_opt_dead_nocells.pl b/test_regress/t/t_opt_dead_nocells.pl
index 2d89b8430..60b8f1f2c 100755
--- a/test_regress/t/t_opt_dead_nocells.pl
+++ b/test_regress/t/t_opt_dead_nocells.pl
@@ -15,7 +15,7 @@ compile(
     );
 
 my @files = glob_all("$Self->{obj_dir}/$Self->{vm_prefix}_*.h");
-file_grep_any(\@files, qr/keptdead/ix);
+file_grep_any(\@files, qr/keptdead/);
 
 ok(1);
 1;
diff --git a/test_regress/t/t_opt_localize_max_size.pl b/test_regress/t/t_opt_localize_max_size.pl
index 44035ce6d..08c91af72 100755
--- a/test_regress/t/t_opt_localize_max_size.pl
+++ b/test_regress/t/t_opt_localize_max_size.pl
@@ -18,7 +18,7 @@ execute(
     );
 
 # Value must differ from that in t_opt_localize_max_size.pl
-file_grep($Self->{stats}, qr/Optimizations, Vars localized\s+(\d+)/i, 5);
+file_grep($Self->{stats}, qr/Optimizations, Vars localized\s+(\d+)/, 5);
 
 ok(1);
 1;
diff --git a/test_regress/t/t_opt_localize_max_size_1.pl b/test_regress/t/t_opt_localize_max_size_1.pl
index ac08f545b..ca334ac3f 100755
--- a/test_regress/t/t_opt_localize_max_size_1.pl
+++ b/test_regress/t/t_opt_localize_max_size_1.pl
@@ -20,7 +20,7 @@ execute(
     );
 
 # Value must differ from that in t_opt_localize_max_size.pl
-file_grep($Self->{stats}, qr/Optimizations, Vars localized\s+(\d+)/i, 4);
+file_grep($Self->{stats}, qr/Optimizations, Vars localized\s+(\d+)/, 4);
 
 ok(1);
 1;
diff --git a/test_regress/t/t_opt_table_enum.pl b/test_regress/t/t_opt_table_enum.pl
index 2ca732a30..6a3f89ba3 100755
--- a/test_regress/t/t_opt_table_enum.pl
+++ b/test_regress/t/t_opt_table_enum.pl
@@ -15,8 +15,8 @@ compile(
     );
 
 if ($Self->{vlt_all}) {
-    file_grep($Self->{stats}, qr/Optimizations, Tables created\s+(\d+)/i, 1);
-    file_grep($Self->{stats}, qr/ConstPool, Tables emitted\s+(\d+)/i, 1);
+    file_grep($Self->{stats}, qr/Optimizations, Tables created\s+(\d+)/, 1);
+    file_grep($Self->{stats}, qr/ConstPool, Tables emitted\s+(\d+)/, 1);
 }
 
 execute(
diff --git a/test_regress/t/t_opt_table_packed_array.pl b/test_regress/t/t_opt_table_packed_array.pl
index 2ca732a30..6a3f89ba3 100755
--- a/test_regress/t/t_opt_table_packed_array.pl
+++ b/test_regress/t/t_opt_table_packed_array.pl
@@ -15,8 +15,8 @@ compile(
     );
 
 if ($Self->{vlt_all}) {
-    file_grep($Self->{stats}, qr/Optimizations, Tables created\s+(\d+)/i, 1);
-    file_grep($Self->{stats}, qr/ConstPool, Tables emitted\s+(\d+)/i, 1);
+    file_grep($Self->{stats}, qr/Optimizations, Tables created\s+(\d+)/, 1);
+    file_grep($Self->{stats}, qr/ConstPool, Tables emitted\s+(\d+)/, 1);
 }
 
 execute(
diff --git a/test_regress/t/t_opt_table_real.pl b/test_regress/t/t_opt_table_real.pl
index 7b6291412..a022e91de 100755
--- a/test_regress/t/t_opt_table_real.pl
+++ b/test_regress/t/t_opt_table_real.pl
@@ -15,8 +15,8 @@ compile(
     );
 
 if ($Self->{vlt_all}) {
-    file_grep($Self->{stats}, qr/Optimizations, Tables created\s+(\d+)/i, 1);
-    file_grep($Self->{stats}, qr/ConstPool, Tables emitted\s+(\d+)/i, 1);
+    file_grep($Self->{stats}, qr/Optimizations, Tables created\s+(\d+)/, 1);
+    file_grep($Self->{stats}, qr/ConstPool, Tables emitted\s+(\d+)/, 1);
 }
 
 execute(
diff --git a/test_regress/t/t_opt_table_same.pl b/test_regress/t/t_opt_table_same.pl
index 77201c68a..bda76de82 100755
--- a/test_regress/t/t_opt_table_same.pl
+++ b/test_regress/t/t_opt_table_same.pl
@@ -15,8 +15,8 @@ compile(
     );
 
 if ($Self->{vlt_all}) {
-    file_grep($Self->{stats}, qr/Optimizations, Tables created\s+(\d+)/i, 2);
-    file_grep($Self->{stats}, qr/ConstPool, Tables emitted\s+(\d+)/i, 1);
+    file_grep($Self->{stats}, qr/Optimizations, Tables created\s+(\d+)/, 2);
+    file_grep($Self->{stats}, qr/ConstPool, Tables emitted\s+(\d+)/, 1);
 }
 
 execute(
diff --git a/test_regress/t/t_opt_table_signed.pl b/test_regress/t/t_opt_table_signed.pl
index 2ca732a30..6a3f89ba3 100755
--- a/test_regress/t/t_opt_table_signed.pl
+++ b/test_regress/t/t_opt_table_signed.pl
@@ -15,8 +15,8 @@ compile(
     );
 
 if ($Self->{vlt_all}) {
-    file_grep($Self->{stats}, qr/Optimizations, Tables created\s+(\d+)/i, 1);
-    file_grep($Self->{stats}, qr/ConstPool, Tables emitted\s+(\d+)/i, 1);
+    file_grep($Self->{stats}, qr/Optimizations, Tables created\s+(\d+)/, 1);
+    file_grep($Self->{stats}, qr/ConstPool, Tables emitted\s+(\d+)/, 1);
 }
 
 execute(
diff --git a/test_regress/t/t_opt_table_sparse.pl b/test_regress/t/t_opt_table_sparse.pl
index 3ddc6d46b..5f7ab5ac6 100755
--- a/test_regress/t/t_opt_table_sparse.pl
+++ b/test_regress/t/t_opt_table_sparse.pl
@@ -15,8 +15,8 @@ compile(
     );
 
 if ($Self->{vlt_all}) {
-    file_grep($Self->{stats}, qr/Optimizations, Tables created\s+(\d+)/i, 1);
-    file_grep($Self->{stats}, qr/ConstPool, Tables emitted\s+(\d+)/i, 2);
+    file_grep($Self->{stats}, qr/Optimizations, Tables created\s+(\d+)/, 1);
+    file_grep($Self->{stats}, qr/ConstPool, Tables emitted\s+(\d+)/, 2);
 }
 
 execute(
diff --git a/test_regress/t/t_opt_table_sparse_output_split.pl b/test_regress/t/t_opt_table_sparse_output_split.pl
index 2e0972cd4..48ee9c21b 100755
--- a/test_regress/t/t_opt_table_sparse_output_split.pl
+++ b/test_regress/t/t_opt_table_sparse_output_split.pl
@@ -18,8 +18,8 @@ compile(
     );
 
 if ($Self->{vlt_all}) {
-    file_grep($Self->{stats}, qr/Optimizations, Tables created\s+(\d+)/i, 1);
-    file_grep($Self->{stats}, qr/ConstPool, Tables emitted\s+(\d+)/i, 2);
+    file_grep($Self->{stats}, qr/Optimizations, Tables created\s+(\d+)/, 1);
+    file_grep($Self->{stats}, qr/ConstPool, Tables emitted\s+(\d+)/, 2);
 }
 
 # Splitting should set VM_PARALLEL_BUILDS to 1 by default
diff --git a/test_regress/t/t_opt_table_string.pl b/test_regress/t/t_opt_table_string.pl
index 2ca732a30..6a3f89ba3 100755
--- a/test_regress/t/t_opt_table_string.pl
+++ b/test_regress/t/t_opt_table_string.pl
@@ -15,8 +15,8 @@ compile(
     );
 
 if ($Self->{vlt_all}) {
-    file_grep($Self->{stats}, qr/Optimizations, Tables created\s+(\d+)/i, 1);
-    file_grep($Self->{stats}, qr/ConstPool, Tables emitted\s+(\d+)/i, 1);
+    file_grep($Self->{stats}, qr/Optimizations, Tables created\s+(\d+)/, 1);
+    file_grep($Self->{stats}, qr/ConstPool, Tables emitted\s+(\d+)/, 1);
 }
 
 execute(
diff --git a/test_regress/t/t_opt_table_struct.pl b/test_regress/t/t_opt_table_struct.pl
index 2ca732a30..6a3f89ba3 100755
--- a/test_regress/t/t_opt_table_struct.pl
+++ b/test_regress/t/t_opt_table_struct.pl
@@ -15,8 +15,8 @@ compile(
     );
 
 if ($Self->{vlt_all}) {
-    file_grep($Self->{stats}, qr/Optimizations, Tables created\s+(\d+)/i, 1);
-    file_grep($Self->{stats}, qr/ConstPool, Tables emitted\s+(\d+)/i, 1);
+    file_grep($Self->{stats}, qr/Optimizations, Tables created\s+(\d+)/, 1);
+    file_grep($Self->{stats}, qr/ConstPool, Tables emitted\s+(\d+)/, 1);
 }
 
 execute(
diff --git a/test_regress/t/t_param_in_func.pl b/test_regress/t/t_param_in_func.pl
index 24ac76f2a..3d3e9f795 100755
--- a/test_regress/t/t_param_in_func.pl
+++ b/test_regress/t/t_param_in_func.pl
@@ -18,7 +18,7 @@ execute();
 
 # The parameter array should have been put in the constant pool
 if ($Self->{vlt_all}) {
-    file_grep($Self->{stats}, qr/ConstPool, Tables emitted\s+(\d+)/i, 3);
+    file_grep($Self->{stats}, qr/ConstPool, Tables emitted\s+(\d+)/, 3);
 }
 
 # Shouldn't have any references to the parameter array
@@ -26,7 +26,7 @@ foreach my $file (
       glob_all("$Self->{obj_dir}/$Self->{vm_prefix}*.h"),
       glob_all("$Self->{obj_dir}/$Self->{vm_prefix}*.cpp")
     ) {
-    file_grep_not($file, qr/digits/i);
+    file_grep_not($file, qr/digits/);
 }
 
 ok(1);
diff --git a/test_regress/t/t_param_in_func_noinline.pl b/test_regress/t/t_param_in_func_noinline.pl
index 3e87d55b6..31ad69d3c 100755
--- a/test_regress/t/t_param_in_func_noinline.pl
+++ b/test_regress/t/t_param_in_func_noinline.pl
@@ -20,7 +20,7 @@ execute();
 
 # The parameter array should have been put in the constant pool
 if ($Self->{vlt_all}) {
-    file_grep($Self->{stats}, qr/ConstPool, Tables emitted\s+(\d+)/i, 3);
+    file_grep($Self->{stats}, qr/ConstPool, Tables emitted\s+(\d+)/, 3);
 }
 
 # Shouldn't have any references to the parameter array
@@ -28,7 +28,7 @@ foreach my $file (
       glob_all("$Self->{obj_dir}/$Self->{vm_prefix}*.h"),
       glob_all("$Self->{obj_dir}/$Self->{vm_prefix}*.cpp")
     ) {
-    file_grep_not($file, qr/digits/i);
+    file_grep_not($file, qr/digits/);
 }
 
 ok(1);
diff --git a/test_regress/t/t_pgo_threads.pl b/test_regress/t/t_pgo_threads.pl
index 8d5770ace..4605edb22 100755
--- a/test_regress/t/t_pgo_threads.pl
+++ b/test_regress/t/t_pgo_threads.pl
@@ -25,7 +25,7 @@ execute(
                       ],
     );
 
-file_grep("$Self->{obj_dir}/profile.vlt", qr/profile_data/i);
+file_grep("$Self->{obj_dir}/profile.vlt", qr/profile_data/);
 
 compile(
     # Intentionally no --prof-pgo here to make sure profile data can be read in
diff --git a/test_regress/t/t_protect_ids.pl b/test_regress/t/t_protect_ids.pl
index 2a8436ab3..b35f6f3cb 100755
--- a/test_regress/t/t_protect_ids.pl
+++ b/test_regress/t/t_protect_ids.pl
@@ -43,7 +43,7 @@ if ($Self->{vlt_all}) {
         if ($filename =~ /secret/i) {
             $Self->error("Secret found in a filename: " . $filename);
         }
-        file_grep_not($filename, qr/secret/i);
+        file_grep_not($filename, qr/secret/);
         $any = 1;
     }
     $any or $Self->error("No outputs found");
diff --git a/test_regress/t/t_reloop_cam.pl b/test_regress/t/t_reloop_cam.pl
index a93f1fbb5..03ab7adf6 100755
--- a/test_regress/t/t_reloop_cam.pl
+++ b/test_regress/t/t_reloop_cam.pl
@@ -21,9 +21,9 @@ execute(
     );
 
 if ($Self->{vlt_all}) {
-    file_grep($Self->{stats}, qr/Optimizations, Reloop iterations\s+(\d+)/i,
+    file_grep($Self->{stats}, qr/Optimizations, Reloop iterations\s+(\d+)/,
               768);
-    file_grep($Self->{stats}, qr/Optimizations, Reloops\s+(\d+)/i,
+    file_grep($Self->{stats}, qr/Optimizations, Reloops\s+(\d+)/,
               3);
 }
 
diff --git a/test_regress/t/t_reloop_offset.pl b/test_regress/t/t_reloop_offset.pl
index 9741bf615..4fda91784 100755
--- a/test_regress/t/t_reloop_offset.pl
+++ b/test_regress/t/t_reloop_offset.pl
@@ -22,9 +22,9 @@ execute(
 
 if ($Self->{vlt}) {
     # Note, with vltmt this might be split differently, so only checking vlt
-    file_grep($Self->{stats}, qr/Optimizations, Reloop iterations\s+(\d+)/i,
+    file_grep($Self->{stats}, qr/Optimizations, Reloop iterations\s+(\d+)/,
               125);
-    file_grep($Self->{stats}, qr/Optimizations, Reloops\s+(\d+)/i,
+    file_grep($Self->{stats}, qr/Optimizations, Reloops\s+(\d+)/,
               2);
 }
 
diff --git a/test_regress/t/t_reloop_offset_lim_63.pl b/test_regress/t/t_reloop_offset_lim_63.pl
index 558a4aeda..535f6d934 100755
--- a/test_regress/t/t_reloop_offset_lim_63.pl
+++ b/test_regress/t/t_reloop_offset_lim_63.pl
@@ -26,9 +26,9 @@ execute(
 
 if ($Self->{vlt}) {
     # Note, with vltmt this might be split differently, so only checking vlt
-    file_grep($Self->{stats}, qr/Optimizations, Reloop iterations\s+(\d+)/i,
+    file_grep($Self->{stats}, qr/Optimizations, Reloop iterations\s+(\d+)/,
               63);
-    file_grep($Self->{stats}, qr/Optimizations, Reloops\s+(\d+)/i,
+    file_grep($Self->{stats}, qr/Optimizations, Reloops\s+(\d+)/,
               1);
 }
 
diff --git a/test_regress/t/t_runflag_quiet.pl b/test_regress/t/t_runflag_quiet.pl
index bfaab429e..cd6acaae8 100755
--- a/test_regress/t/t_runflag_quiet.pl
+++ b/test_regress/t/t_runflag_quiet.pl
@@ -19,7 +19,7 @@ execute(
     logfile => "$Self->{obj_dir}/sim__quiet.log",
     );
 
-file_grep_not("$Self->{obj_dir}/sim__quiet.log", qr/S i m u l a t/i,);
+file_grep_not("$Self->{obj_dir}/sim__quiet.log", qr/S i m u l a t/);
 
 #---
 
@@ -28,7 +28,7 @@ execute(
     logfile => "$Self->{obj_dir}/sim__noquiet.log",
     );
 
-file_grep("$Self->{obj_dir}/sim__noquiet.log", qr/S i m u l a t/i,);
+file_grep("$Self->{obj_dir}/sim__noquiet.log", qr/S i m u l a t/);
 
 ok(1);
 
diff --git a/test_regress/t/t_split_var_0.pl b/test_regress/t/t_split_var_0.pl
index 656c3dd29..6b89bd7c3 100755
--- a/test_regress/t/t_split_var_0.pl
+++ b/test_regress/t/t_split_var_0.pl
@@ -21,7 +21,7 @@ compile(
 execute(
     );
 
-file_grep($Self->{stats}, qr/SplitVar,\s+Split packed variables\s+(\d+)/i, 13);
-file_grep($Self->{stats}, qr/SplitVar,\s+Split unpacked arrays\s+(\d+)/i, 27);
+file_grep($Self->{stats}, qr/SplitVar,\s+Split packed variables\s+(\d+)/, 13);
+file_grep($Self->{stats}, qr/SplitVar,\s+Split unpacked arrays\s+(\d+)/, 27);
 ok(1);
 1;
diff --git a/test_regress/t/t_split_var_2_trace.pl b/test_regress/t/t_split_var_2_trace.pl
index 073fc3eec..063576e38 100755
--- a/test_regress/t/t_split_var_2_trace.pl
+++ b/test_regress/t/t_split_var_2_trace.pl
@@ -23,8 +23,8 @@ execute(
     );
 
 vcd_identical("$Self->{obj_dir}/simx.vcd", $Self->{golden_filename});
-file_grep($Self->{stats}, qr/SplitVar,\s+Split packed variables\s+(\d+)/i, 12);
-file_grep($Self->{stats}, qr/SplitVar,\s+Split unpacked arrays\s+(\d+)/i, 27);
+file_grep($Self->{stats}, qr/SplitVar,\s+Split packed variables\s+(\d+)/, 12);
+file_grep($Self->{stats}, qr/SplitVar,\s+Split unpacked arrays\s+(\d+)/, 27);
 
 ok(1);
 1;
diff --git a/test_regress/t/t_split_var_3_wreal.pl b/test_regress/t/t_split_var_3_wreal.pl
index 6357db47a..bfc48f7d0 100755
--- a/test_regress/t/t_split_var_3_wreal.pl
+++ b/test_regress/t/t_split_var_3_wreal.pl
@@ -17,7 +17,7 @@ compile(
 execute(
     );
 
-file_grep($Self->{stats}, qr/SplitVar,\s+Split packed variables\s+(\d+)/i, 0);
-file_grep($Self->{stats}, qr/SplitVar,\s+Split unpacked arrays\s+(\d+)/i, 3);
+file_grep($Self->{stats}, qr/SplitVar,\s+Split packed variables\s+(\d+)/, 0);
+file_grep($Self->{stats}, qr/SplitVar,\s+Split unpacked arrays\s+(\d+)/, 3);
 ok(1);
 1;
diff --git a/test_regress/t/t_split_var_4.pl b/test_regress/t/t_split_var_4.pl
index 106de60d0..cb683da73 100755
--- a/test_regress/t/t_split_var_4.pl
+++ b/test_regress/t/t_split_var_4.pl
@@ -17,7 +17,7 @@ compile(
 execute(
     );
 
-file_grep($Self->{stats}, qr/SplitVar,\s+Split packed variables\s+(\d+)/i, 1);
-file_grep($Self->{stats}, qr/SplitVar,\s+Split unpacked arrays\s+(\d+)/i, 0);
+file_grep($Self->{stats}, qr/SplitVar,\s+Split packed variables\s+(\d+)/, 1);
+file_grep($Self->{stats}, qr/SplitVar,\s+Split unpacked arrays\s+(\d+)/, 0);
 ok(1);
 1;
diff --git a/test_regress/t/t_split_var_5.pl b/test_regress/t/t_split_var_5.pl
index b69b2643d..6b5464499 100755
--- a/test_regress/t/t_split_var_5.pl
+++ b/test_regress/t/t_split_var_5.pl
@@ -18,7 +18,7 @@ compile(
 execute(
     );
 
-file_grep($Self->{stats}, qr/SplitVar,\s+Split packed variables\s+(\d+)/i, 0);
-file_grep($Self->{stats}, qr/SplitVar,\s+Split unpacked arrays\s+(\d+)/i, 0);
+file_grep($Self->{stats}, qr/SplitVar,\s+Split packed variables\s+(\d+)/, 0);
+file_grep($Self->{stats}, qr/SplitVar,\s+Split unpacked arrays\s+(\d+)/, 0);
 ok(1);
 1;
diff --git a/test_regress/t/t_struct_unused.pl b/test_regress/t/t_struct_unused.pl
index 6d6555af8..14a2db81b 100755
--- a/test_regress/t/t_struct_unused.pl
+++ b/test_regress/t/t_struct_unused.pl
@@ -22,7 +22,7 @@ if ($Self->{vlt_all}) {
     # Check for unused structs in any outputs
     my $any;
     foreach my $filename (glob $Self->{obj_dir} . "/*.[ch]*") {
-        file_grep_not($filename, qr/useless/i);
+        file_grep_not($filename, qr/useless/);
         $any = 1;
     }
     $any or $Self->error("No outputs found");
diff --git a/test_regress/t/t_sys_rand_concat.pl b/test_regress/t/t_sys_rand_concat.pl
index 3ed49a026..8ad4c11dd 100755
--- a/test_regress/t/t_sys_rand_concat.pl
+++ b/test_regress/t/t_sys_rand_concat.pl
@@ -17,7 +17,7 @@ execute(
     );
 
 for my $file (glob_all("$Self->{obj_dir}/$Self->{vm_prefix}___024root__DepSet*__Slow.cpp")) {
-    file_grep_not($file, qr/(<<|>>)/x);
+    file_grep_not($file, qr/(<<|>>)/);
 }
 
 ok(1);
diff --git a/test_regress/t/t_threads_nondeterminism.pl b/test_regress/t/t_threads_nondeterminism.pl
index 3a705ffe0..202a0adb0 100755
--- a/test_regress/t/t_threads_nondeterminism.pl
+++ b/test_regress/t/t_threads_nondeterminism.pl
@@ -20,7 +20,7 @@ compile(
 execute(
     );
 
-file_grep("$Self->{obj_dir}/vlt_compile.log", qr/hash of shape/i);
+file_grep("$Self->{obj_dir}/vlt_compile.log", qr/Hash of shape/);
 
 ok(1);
 1;
diff --git a/test_regress/t/t_timing_protect.pl b/test_regress/t/t_timing_protect.pl
index dfe1e9625..4ecb6cff6 100755
--- a/test_regress/t/t_timing_protect.pl
+++ b/test_regress/t/t_timing_protect.pl
@@ -28,8 +28,8 @@ else {
         # Check for secret in any outputs
         my $any;
         foreach my $filename (glob $Self->{obj_dir} . "/*.[ch]*") {
-            file_grep_not($filename, qr/event[123]/i);
-            file_grep_not($filename, qr/t_timing_fork_join/i);
+            file_grep_not($filename, qr/event[123]/);
+            file_grep_not($filename, qr/t_timing_fork_join/);
             $any = 1;
     }
     $any or $Self->error("No outputs found");
diff --git a/test_regress/t/t_trace_decoration.pl b/test_regress/t/t_trace_decoration.pl
index 3d75cc8ff..e96c62761 100755
--- a/test_regress/t/t_trace_decoration.pl
+++ b/test_regress/t/t_trace_decoration.pl
@@ -17,7 +17,7 @@ compile(
 execute(
     );
 
-file_grep_not("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr!// Body!x);
+file_grep_not("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr!// Body!);
 
 ok(1);
 1;
diff --git a/test_regress/t/t_trace_ena_cc.pl b/test_regress/t/t_trace_ena_cc.pl
index e6a88ec40..03b9da4c6 100755
--- a/test_regress/t/t_trace_ena_cc.pl
+++ b/test_regress/t/t_trace_ena_cc.pl
@@ -20,10 +20,10 @@ execute(
     );
 
 if ($Self->{vlt_all}) {
-    file_grep("$Self->{obj_dir}/V$Self->{name}__Trace__0__Slow.cpp", qr/c_trace_on\"/x);
-    file_grep_not("$Self->{obj_dir}/V$Self->{name}__Trace__0__Slow.cpp", qr/_trace_off\"/x);
-    file_grep("$Self->{obj_dir}/simx.vcd", qr/\$enddefinitions/x);
-    file_grep_not("$Self->{obj_dir}/simx.vcd", qr/inside_sub/x);
+    file_grep("$Self->{obj_dir}/V$Self->{name}__Trace__0__Slow.cpp", qr/c_trace_on\"/);
+    file_grep_not("$Self->{obj_dir}/V$Self->{name}__Trace__0__Slow.cpp", qr/_trace_off\"/);
+    file_grep("$Self->{obj_dir}/simx.vcd", qr/\$enddefinitions/);
+    file_grep_not("$Self->{obj_dir}/simx.vcd", qr/inside_sub/);
 
     vcd_identical("$Self->{obj_dir}/simx.vcd", $Self->{golden_filename});
 }
diff --git a/test_regress/t/t_trace_ena_sc.pl b/test_regress/t/t_trace_ena_sc.pl
index ed758eec1..392dce00a 100755
--- a/test_regress/t/t_trace_ena_sc.pl
+++ b/test_regress/t/t_trace_ena_sc.pl
@@ -25,7 +25,7 @@ else {
 
     if ($Self->{vlt_all}) {
         # Note more checks in _cc.pl
-        file_grep("$Self->{obj_dir}/simx.vcd", qr/\$enddefinitions/x);
+        file_grep("$Self->{obj_dir}/simx.vcd", qr/\$enddefinitions/);
 
         vcd_identical("$Self->{obj_dir}/simx.vcd", $Self->{golden_filename});
     }
diff --git a/test_regress/t/t_trace_public_sig.pl b/test_regress/t/t_trace_public_sig.pl
index fd9ced9fb..ee9329780 100755
--- a/test_regress/t/t_trace_public_sig.pl
+++ b/test_regress/t/t_trace_public_sig.pl
@@ -25,7 +25,7 @@ execute(
 vcd_identical("$Self->{obj_dir}/simx.vcd", $Self->{golden_filename});
 
 # vcd_identical doesn't detect "$var a.b;" vs "$scope module a; $var b;"
-file_grep("$Self->{obj_dir}/simx.vcd", qr/module glbl/i);
+file_grep("$Self->{obj_dir}/simx.vcd", qr/module glbl/);
 
 ok(1);
 1;
diff --git a/test_regress/t/t_trace_public_sig_vlt.pl b/test_regress/t/t_trace_public_sig_vlt.pl
index 5c0454eac..2db395db8 100755
--- a/test_regress/t/t_trace_public_sig_vlt.pl
+++ b/test_regress/t/t_trace_public_sig_vlt.pl
@@ -31,7 +31,7 @@ execute(
 vcd_identical("$Self->{obj_dir}/simx.vcd", $Self->{golden_filename});
 
 # vcd_identical doesn't detect "$var a.b;" vs "$scope module a; $var b;"
-file_grep("$Self->{obj_dir}/simx.vcd", qr/module glbl/i);
+file_grep("$Self->{obj_dir}/simx.vcd", qr/module glbl/);
 
 ok(1);
 1;
diff --git a/test_regress/t/t_trace_rollover.pl b/test_regress/t/t_trace_rollover.pl
index 5f3032d2a..df8c2e695 100755
--- a/test_regress/t/t_trace_rollover.pl
+++ b/test_regress/t/t_trace_rollover.pl
@@ -27,9 +27,9 @@ system("cat $Self->{obj_dir}/simrollover_cat*.vcd "
 vcd_identical("$Self->{obj_dir}/simall.vcd",
               $Self->{golden_filename});
 
-file_grep_not("$Self->{obj_dir}/simrollover_cat0000.vcd", qr/^#/i);
-file_grep("$Self->{obj_dir}/simrollover_cat0001.vcd", qr/^#/i);
-file_grep("$Self->{obj_dir}/simrollover_cat0002.vcd", qr/^#/i);
+file_grep_not("$Self->{obj_dir}/simrollover_cat0000.vcd", qr/^#/);
+file_grep("$Self->{obj_dir}/simrollover_cat0001.vcd", qr/^#/);
+file_grep("$Self->{obj_dir}/simrollover_cat0002.vcd", qr/^#/);
 
 ok(1);
 1;
diff --git a/test_regress/t/t_trace_two_dump_cc.pl b/test_regress/t/t_trace_two_dump_cc.pl
index a1d8968f5..20c5ca291 100755
--- a/test_regress/t/t_trace_two_dump_cc.pl
+++ b/test_regress/t/t_trace_two_dump_cc.pl
@@ -37,7 +37,7 @@ execute(
     );
 
 if ($Self->{vlt_all}) {
-    file_grep("$Self->{obj_dir}/simx.vcd", qr/\$enddefinitions/x);
+    file_grep("$Self->{obj_dir}/simx.vcd", qr/\$enddefinitions/);
     vcd_identical("$Self->{obj_dir}/simx.vcd", $Self->{golden_filename});
 }
 
diff --git a/test_regress/t/t_trace_two_dump_sc.pl b/test_regress/t/t_trace_two_dump_sc.pl
index 38bee444a..87285c1a7 100755
--- a/test_regress/t/t_trace_two_dump_sc.pl
+++ b/test_regress/t/t_trace_two_dump_sc.pl
@@ -41,7 +41,7 @@ else {
         );
 
     if ($Self->{vlt_all}) {
-        file_grep("$Self->{obj_dir}/simx.vcd", qr/\$enddefinitions/x);
+        file_grep("$Self->{obj_dir}/simx.vcd", qr/\$enddefinitions/);
         vcd_identical("$Self->{obj_dir}/simx.vcd", $Self->{golden_filename});
     }
 }
diff --git a/test_regress/t/t_trace_two_hdr_cc.pl b/test_regress/t/t_trace_two_hdr_cc.pl
index f294b4c15..b0e9d5b76 100755
--- a/test_regress/t/t_trace_two_hdr_cc.pl
+++ b/test_regress/t/t_trace_two_hdr_cc.pl
@@ -37,7 +37,7 @@ execute(
     );
 
 if ($Self->{vlt_all}) {
-    file_grep("$Self->{obj_dir}/simx.vcd", qr/\$enddefinitions/x);
+    file_grep("$Self->{obj_dir}/simx.vcd", qr/\$enddefinitions/);
     vcd_identical("$Self->{obj_dir}/simx.vcd", $Self->{golden_filename});
 }
 
diff --git a/test_regress/t/t_trace_two_hdr_sc.pl b/test_regress/t/t_trace_two_hdr_sc.pl
index 66e623caf..dd02a0617 100755
--- a/test_regress/t/t_trace_two_hdr_sc.pl
+++ b/test_regress/t/t_trace_two_hdr_sc.pl
@@ -41,7 +41,7 @@ else {
         );
 
     if ($Self->{vlt_all}) {
-        file_grep("$Self->{obj_dir}/simx.vcd", qr/\$enddefinitions/x);
+        file_grep("$Self->{obj_dir}/simx.vcd", qr/\$enddefinitions/);
         vcd_identical("$Self->{obj_dir}/simx.vcd", $Self->{golden_filename});
     }
 }
diff --git a/test_regress/t/t_trace_two_port_cc.pl b/test_regress/t/t_trace_two_port_cc.pl
index 685502e70..78fa084fe 100755
--- a/test_regress/t/t_trace_two_port_cc.pl
+++ b/test_regress/t/t_trace_two_port_cc.pl
@@ -37,7 +37,7 @@ execute(
     );
 
 if ($Self->{vlt_all}) {
-    file_grep("$Self->{obj_dir}/simx.vcd", qr/\$enddefinitions/x);
+    file_grep("$Self->{obj_dir}/simx.vcd", qr/\$enddefinitions/);
     vcd_identical("$Self->{obj_dir}/simx.vcd", $Self->{golden_filename});
 }
 
diff --git a/test_regress/t/t_trace_two_port_sc.pl b/test_regress/t/t_trace_two_port_sc.pl
index 935dc004e..708c252a4 100755
--- a/test_regress/t/t_trace_two_port_sc.pl
+++ b/test_regress/t/t_trace_two_port_sc.pl
@@ -41,7 +41,7 @@ else {
         );
 
     if ($Self->{vlt_all}) {
-        file_grep("$Self->{obj_dir}/simx.vcd", qr/\$enddefinitions/x);
+        file_grep("$Self->{obj_dir}/simx.vcd", qr/\$enddefinitions/);
         vcd_identical("$Self->{obj_dir}/simx.vcd", $Self->{golden_filename});
     }
 }
diff --git a/test_regress/t/t_unopt_combo_isolate.pl b/test_regress/t/t_unopt_combo_isolate.pl
index 8eccab6d3..a06f61a8d 100755
--- a/test_regress/t/t_unopt_combo_isolate.pl
+++ b/test_regress/t/t_unopt_combo_isolate.pl
@@ -18,7 +18,7 @@ compile(
     );
 
 if ($Self->{vlt_all}) {
-    file_grep($Self->{stats}, qr/Optimizations, isolate_assignments blocks\s+3/i);
+    file_grep($Self->{stats}, qr/Optimizations, isolate_assignments blocks\s+3/);
     file_grep("$out_filename", qr/{"type":"VAR","name":"t.b",.*"loc":"e,23:[^"]*",.*"origName":"b",.*"attrIsolateAssign":true,.*"dtypeName":"logic"/);
     file_grep("$out_filename", qr/{"type":"VAR","name":"__Vfunc_t.file.get_31_16__0__Vfuncout",.*"loc":"e,99:[^"]*",.*"origName":"__Vfunc_t__DOT__file__DOT__get_31_16__0__Vfuncout",.*"attrIsolateAssign":true,.*"dtypeName":"logic"/);
     file_grep("$out_filename", qr/{"type":"VAR","name":"__Vfunc_t.file.get_31_16__0__t_crc",.*"loc":"e,100:[^"]*",.*"origName":"__Vfunc_t__DOT__file__DOT__get_31_16__0__t_crc",.*"attrIsolateAssign":true,.*"dtypeName":"logic"/);
diff --git a/test_regress/t/t_unopt_combo_isolate_vlt.pl b/test_regress/t/t_unopt_combo_isolate_vlt.pl
index 523a49945..cea7051ed 100755
--- a/test_regress/t/t_unopt_combo_isolate_vlt.pl
+++ b/test_regress/t/t_unopt_combo_isolate_vlt.pl
@@ -18,7 +18,7 @@ compile(
     );
 
 if ($Self->{vlt_all}) {
-    file_grep($Self->{stats}, qr/Optimizations, isolate_assignments blocks\s+3/i);
+    file_grep($Self->{stats}, qr/Optimizations, isolate_assignments blocks\s+3/);
     file_grep("$out_filename", qr/{"type":"VAR","name":"t.b",.*"loc":"f,23:[^"]*",.*"origName":"b",.*"attrIsolateAssign":true,.*"dtypeName":"logic"/);
     file_grep("$out_filename", qr/{"type":"VAR","name":"__Vfunc_t.file.get_31_16__0__Vfuncout",.*"loc":"f,104:[^"]*",.*"origName":"__Vfunc_t__DOT__file__DOT__get_31_16__0__Vfuncout",.*"attrIsolateAssign":true,.*"dtypeName":"logic"/);
     file_grep("$out_filename", qr/{"type":"VAR","name":"__Vfunc_t.file.get_31_16__0__t_crc",.*"loc":"f,105:[^"]*",.*"origName":"__Vfunc_t__DOT__file__DOT__get_31_16__0__t_crc",.*"attrIsolateAssign":true,.*"dtypeName":"logic"/);
diff --git a/test_regress/t/t_unroll_pragma_disable.pl b/test_regress/t/t_unroll_pragma_disable.pl
index be362c068..5768e83d0 100755
--- a/test_regress/t/t_unroll_pragma_disable.pl
+++ b/test_regress/t/t_unroll_pragma_disable.pl
@@ -19,7 +19,7 @@ compile(
     make_main => 0,
     );
 
-file_grep($Self->{stats}, qr/Optimizations, Unrolled Loops\s+(\d+)/i, 1);
+file_grep($Self->{stats}, qr/Optimizations, Unrolled Loops\s+(\d+)/, 1);
 
 ok(1);
 1;
diff --git a/test_regress/t/t_unroll_pragma_full.pl b/test_regress/t/t_unroll_pragma_full.pl
index 0b58b01a9..d50c226d3 100755
--- a/test_regress/t/t_unroll_pragma_full.pl
+++ b/test_regress/t/t_unroll_pragma_full.pl
@@ -19,7 +19,7 @@ compile(
     make_main => 0,
     );
 
-file_grep($Self->{stats}, qr/Optimizations, Unrolled Loops\s+(\d+)/i, 5);
+file_grep($Self->{stats}, qr/Optimizations, Unrolled Loops\s+(\d+)/, 5);
 
 ok(1);
 1;
diff --git a/test_regress/t/t_unroll_pragma_none.pl b/test_regress/t/t_unroll_pragma_none.pl
index 933e315a3..346bf6caf 100755
--- a/test_regress/t/t_unroll_pragma_none.pl
+++ b/test_regress/t/t_unroll_pragma_none.pl
@@ -19,7 +19,7 @@ compile(
     make_main => 0,
     );
 
-file_grep($Self->{stats}, qr/Optimizations, Unrolled Loops\s+(\d+)/i, 3);
+file_grep($Self->{stats}, qr/Optimizations, Unrolled Loops\s+(\d+)/, 3);
 
 ok(1);
 1;
diff --git a/test_regress/t/t_var_escape.pl b/test_regress/t/t_var_escape.pl
index b454a142e..1384aa5a4 100755
--- a/test_regress/t/t_var_escape.pl
+++ b/test_regress/t/t_var_escape.pl
@@ -19,7 +19,7 @@ execute(
     );
 
 if ($Self->{vlt_all}) {
-    file_grep("$Self->{obj_dir}/simx.vcd", qr/\$enddefinitions/x);
+    file_grep("$Self->{obj_dir}/simx.vcd", qr/\$enddefinitions/);
     my $sig = quotemeta("bra[ket]slash/dash-colon:9");
     file_grep("$Self->{obj_dir}/simx.vcd", qr/ $sig/);
     file_grep("$Self->{obj_dir}/simx.vcd", qr/ other\.cyc /);
diff --git a/test_regress/t/t_var_life.pl b/test_regress/t/t_var_life.pl
index 65fa5cb6d..2ea441dcb 100755
--- a/test_regress/t/t_var_life.pl
+++ b/test_regress/t/t_var_life.pl
@@ -15,8 +15,8 @@ compile(
     );
 
 if ($Self->{vlt_all}) {
-    file_grep($Self->{stats}, qr/Optimizations, Lifetime assign deletions\s+(\d+)/i, 4);
-    file_grep($Self->{stats}, qr/Optimizations, Lifetime constant prop\s+(\d+)/i, 2);
+    file_grep($Self->{stats}, qr/Optimizations, Lifetime assign deletions\s+(\d+)/, 4);
+    file_grep($Self->{stats}, qr/Optimizations, Lifetime constant prop\s+(\d+)/, 2);
 }
 
 execute(
diff --git a/test_regress/t/t_var_pins_cc.pl b/test_regress/t/t_var_pins_cc.pl
index e8330324e..90a0a6d02 100755
--- a/test_regress/t/t_var_pins_cc.pl
+++ b/test_regress/t/t_var_pins_cc.pl
@@ -20,19 +20,19 @@ compile(
     );
 
 {
-    file_grep("$Self->{obj_dir}/Vt_var_pins_cc.h", qr/VL_IN8  \(&i1,0,0\);/x);
-    file_grep("$Self->{obj_dir}/Vt_var_pins_cc.h", qr/VL_IN8  \(&i8,7,0\);/x);
-    file_grep("$Self->{obj_dir}/Vt_var_pins_cc.h", qr/VL_IN16 \(&i16,15,0\);/x);
-    file_grep("$Self->{obj_dir}/Vt_var_pins_cc.h", qr/VL_IN   \(&i32,31,0\);/x);
-    file_grep("$Self->{obj_dir}/Vt_var_pins_cc.h", qr/VL_IN64 \(&i64,63,0\);/x);
-    file_grep("$Self->{obj_dir}/Vt_var_pins_cc.h", qr/VL_INW  \(&i65,64,0,3\);/x);
+    file_grep("$Self->{obj_dir}/Vt_var_pins_cc.h", qr/VL_IN8\(&i1,0,0\);/);
+    file_grep("$Self->{obj_dir}/Vt_var_pins_cc.h", qr/VL_IN8\(&i8,7,0\);/);
+    file_grep("$Self->{obj_dir}/Vt_var_pins_cc.h", qr/VL_IN16\(&i16,15,0\);/);
+    file_grep("$Self->{obj_dir}/Vt_var_pins_cc.h", qr/VL_IN\(&i32,31,0\);/);
+    file_grep("$Self->{obj_dir}/Vt_var_pins_cc.h", qr/VL_IN64\(&i64,63,0\);/);
+    file_grep("$Self->{obj_dir}/Vt_var_pins_cc.h", qr/VL_INW\(&i65,64,0,3\);/);
 
-    file_grep("$Self->{obj_dir}/Vt_var_pins_cc.h", qr/VL_OUT8 \(&o1,0,0\);/x);
-    file_grep("$Self->{obj_dir}/Vt_var_pins_cc.h", qr/VL_OUT8 \(&o8,7,0\);/x);
-    file_grep("$Self->{obj_dir}/Vt_var_pins_cc.h", qr/VL_OUT16\(&o16,15,0\);/x);
-    file_grep("$Self->{obj_dir}/Vt_var_pins_cc.h", qr/VL_OUT  \(&o32,31,0\);/x);
-    file_grep("$Self->{obj_dir}/Vt_var_pins_cc.h", qr/VL_OUT64\(&o64,63,0\);/x);
-    file_grep("$Self->{obj_dir}/Vt_var_pins_cc.h", qr/VL_OUTW \(&o65,64,0,3\);/x);
+    file_grep("$Self->{obj_dir}/Vt_var_pins_cc.h", qr/VL_OUT8\(&o1,0,0\);/);
+    file_grep("$Self->{obj_dir}/Vt_var_pins_cc.h", qr/VL_OUT8\(&o8,7,0\);/);
+    file_grep("$Self->{obj_dir}/Vt_var_pins_cc.h", qr/VL_OUT16\(&o16,15,0\);/);
+    file_grep("$Self->{obj_dir}/Vt_var_pins_cc.h", qr/VL_OUT\(&o32,31,0\);/);
+    file_grep("$Self->{obj_dir}/Vt_var_pins_cc.h", qr/VL_OUT64\(&o64,63,0\);/);
+    file_grep("$Self->{obj_dir}/Vt_var_pins_cc.h", qr/VL_OUTW\(&o65,64,0,3\);/);
 }
 
 ok(1);
diff --git a/test_regress/t/t_var_pins_sc1.pl b/test_regress/t/t_var_pins_sc1.pl
index c7e21f8f3..d9b080f93 100755
--- a/test_regress/t/t_var_pins_sc1.pl
+++ b/test_regress/t/t_var_pins_sc1.pl
@@ -18,27 +18,27 @@ compile(
     );
 
 if ($Self->{vlt_all}) {
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_bv<1>\s> \s+ &i1;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_bv<8>\s> \s+ &i8;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_bv<16>\s> \s+ &i16;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_bv<32>\s> \s+ &i32;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_bv<64>\s> \s+ &i64;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_bv<65>\s> \s+ &i65;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_bv<1>\s> \s+ &ibv1;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_bv<16>\s> \s+ &ibv16;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_bv<1>\s> \s+ &ibv1_vlt;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_bv<16>\s> \s+ &ibv16_vlt;/x);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_bv<1>\s>\s+&i1;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_bv<8>\s>\s+&i8;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_bv<16>\s>\s+&i16;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_bv<32>\s>\s+&i32;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_bv<64>\s>\s+&i64;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_bv<65>\s>\s+&i65;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_bv<1>\s>\s+&ibv1;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_bv<16>\s>\s+&ibv16;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_bv<1>\s>\s+&ibv1_vlt;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_bv<16>\s>\s+&ibv16_vlt;/);
 
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_bv<1>\s> \s+ &o1;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_bv<8>\s> \s+ &o8;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_bv<16>\s> \s+ &o16;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_bv<32>\s> \s+ &o32;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_bv<64>\s> \s+ &o64;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_bv<65>\s> \s+ &o65;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_bv<1>\s> \s+ &obv1;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_bv<16>\s> \s+ &obv16;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_bv<1>\s> \s+ &obv1_vlt;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_bv<16>\s> \s+ &obv16_vlt;/x);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_bv<1>\s>\s+&o1;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_bv<8>\s>\s+&o8;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_bv<16>\s>\s+&o16;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_bv<32>\s>\s+&o32;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_bv<64>\s>\s+&o64;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_bv<65>\s>\s+&o65;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_bv<1>\s>\s+&obv1;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_bv<16>\s>\s+&obv16;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_bv<1>\s>\s+&obv1_vlt;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_bv<16>\s>\s+&obv16_vlt;/);
 }
 
 execute();
diff --git a/test_regress/t/t_var_pins_sc2.pl b/test_regress/t/t_var_pins_sc2.pl
index 4380d3993..756e41c48 100755
--- a/test_regress/t/t_var_pins_sc2.pl
+++ b/test_regress/t/t_var_pins_sc2.pl
@@ -18,27 +18,27 @@ compile(
     );
 
 {
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<bool> \s+ &i1;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_bv<8>\s> \s+ &i8;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_bv<16>\s> \s+ &i16;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_bv<32>\s> \s+ &i32;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_bv<64>\s> \s+ &i64;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_bv<65>\s> \s+ &i65;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_bv<1>\s> \s+ &ibv1;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_bv<16>\s> \s+ &ibv16;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_bv<1>\s> \s+ &ibv1_vlt;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_bv<16>\s> \s+ &ibv16_vlt;/x);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<bool>\s+&i1;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_bv<8>\s>\s+&i8;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_bv<16>\s>\s+&i16;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_bv<32>\s>\s+&i32;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_bv<64>\s>\s+&i64;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_bv<65>\s>\s+&i65;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_bv<1>\s>\s+&ibv1;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_bv<16>\s>\s+&ibv16;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_bv<1>\s>\s+&ibv1_vlt;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_bv<16>\s>\s+&ibv16_vlt;/);
 
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<bool> \s+ &o1;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_bv<8>\s> \s+ &o8;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_bv<16>\s> \s+ &o16;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_bv<32>\s> \s+ &o32;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_bv<64>\s> \s+ &o64;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_bv<65>\s> \s+ &o65;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_bv<1>\s> \s+ &obv1;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_bv<16>\s> \s+ &obv16;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_bv<1>\s> \s+ &obv1_vlt;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_bv<16>\s> \s+ &obv16_vlt;/x);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<bool>\s+&o1;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_bv<8>\s>\s+&o8;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_bv<16>\s>\s+&o16;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_bv<32>\s>\s+&o32;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_bv<64>\s>\s+&o64;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_bv<65>\s>\s+&o65;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_bv<1>\s>\s+&obv1;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_bv<16>\s>\s+&obv16;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_bv<1>\s>\s+&obv1_vlt;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_bv<16>\s>\s+&obv16_vlt;/);
 }
 
 execute();
diff --git a/test_regress/t/t_var_pins_sc32.pl b/test_regress/t/t_var_pins_sc32.pl
index 350d5227c..60c70e04c 100755
--- a/test_regress/t/t_var_pins_sc32.pl
+++ b/test_regress/t/t_var_pins_sc32.pl
@@ -18,27 +18,27 @@ compile(
     );
 
 {
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<bool> \s+ &i1;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<uint32_t> \s+ &i8;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<uint32_t> \s+ &i16;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<uint32_t> \s+ &i32;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_bv<64>\s> \s+ &i64;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_bv<65>\s> \s+ &i65;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_bv<1>\s> \s+ &ibv1;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_bv<16>\s> \s+ &ibv16;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_bv<1>\s> \s+ &ibv1_vlt;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_bv<16>\s> \s+ &ibv16_vlt;/x);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<bool>\s+&i1;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<uint32_t>\s+&i8;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<uint32_t>\s+&i16;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<uint32_t>\s+&i32;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_bv<64>\s>\s+&i64;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_bv<65>\s>\s+&i65;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_bv<1>\s>\s+&ibv1;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_bv<16>\s>\s+&ibv16;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_bv<1>\s>\s+&ibv1_vlt;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_bv<16>\s>\s+&ibv16_vlt;/);
 
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<bool> \s+ &o1;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<uint32_t> \s+ &o8;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<uint32_t> \s+ &o16;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<uint32_t> \s+ &o32;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_bv<64>\s> \s+ &o64;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_bv<65>\s> \s+ &o65;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_bv<1>\s> \s+ &obv1;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_bv<16>\s> \s+ &obv16;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_bv<1>\s> \s+ &obv1_vlt;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_bv<16>\s> \s+ &obv16_vlt;/x);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<bool>\s+&o1;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<uint32_t>\s+&o8;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<uint32_t>\s+&o16;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<uint32_t>\s+&o32;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_bv<64>\s>\s+&o64;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_bv<65>\s>\s+&o65;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_bv<1>\s>\s+&obv1;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_bv<16>\s>\s+&obv16;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_bv<1>\s>\s+&obv1_vlt;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_bv<16>\s>\s+&obv16_vlt;/);
 }
 
 execute();
diff --git a/test_regress/t/t_var_pins_sc64.pl b/test_regress/t/t_var_pins_sc64.pl
index 500f57ae4..0c014a722 100755
--- a/test_regress/t/t_var_pins_sc64.pl
+++ b/test_regress/t/t_var_pins_sc64.pl
@@ -18,27 +18,27 @@ compile(
     );
 
 if ($Self->{vlt_all}) {
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<bool> \s+ &i1;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<uint32_t> \s+ &i8;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<uint32_t> \s+ &i16;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<uint32_t> \s+ &i32;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<uint64_t> \s+ &i64;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_bv<65>\s> \s+ &i65;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_bv<1>\s> \s+ &ibv1;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_bv<16>\s> \s+ &ibv16;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_bv<1>\s> \s+ &ibv1_vlt;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_bv<16>\s> \s+ &ibv16_vlt;/x);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<bool>\s+&i1;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<uint32_t>\s+&i8;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<uint32_t>\s+&i16;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<uint32_t>\s+&i32;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<uint64_t>\s+&i64;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_bv<65>\s>\s+&i65;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_bv<1>\s>\s+&ibv1;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_bv<16>\s>\s+&ibv16;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_bv<1>\s>\s+&ibv1_vlt;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_bv<16>\s>\s+&ibv16_vlt;/);
 
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<bool> \s+ &o1;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<uint32_t> \s+ &o8;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<uint32_t> \s+ &o16;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<uint32_t> \s+ &o32;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<uint64_t> \s+ &o64;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_bv<65>\s> \s+ &o65;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_bv<1>\s> \s+ &obv1;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_bv<16>\s> \s+ &obv16;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_bv<1>\s> \s+ &obv1_vlt;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_bv<16>\s> \s+ &obv16_vlt;/x);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<bool>\s+&o1;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<uint32_t>\s+&o8;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<uint32_t>\s+&o16;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<uint32_t>\s+&o32;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<uint64_t>\s+&o64;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_bv<65>\s>\s+&o65;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_bv<1>\s>\s+&obv1;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_bv<16>\s>\s+&obv16;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_bv<1>\s>\s+&obv1_vlt;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_bv<16>\s>\s+&obv16_vlt;/);
 }
 
 execute();
diff --git a/test_regress/t/t_var_pins_sc_biguint.pl b/test_regress/t/t_var_pins_sc_biguint.pl
index ad87f7295..30a25337a 100755
--- a/test_regress/t/t_var_pins_sc_biguint.pl
+++ b/test_regress/t/t_var_pins_sc_biguint.pl
@@ -18,27 +18,27 @@ compile(
     );
 
 if ($Self->{vlt_all}) {
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<bool> \s+ &i1;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<uint32_t> \s+ &i8;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<uint32_t> \s+ &i16;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<uint32_t> \s+ &i32;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<uint64_t> \s+ &i64;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_biguint<65>\s> \s+ &i65;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_biguint<128>\s> \s+ &i128;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_bv<513>\s> \s+ &i513;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_bv<1>\s> \s+ &ibv1;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_bv<16>\s> \s+ &ibv16;/x);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<bool>\s+&i1;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<uint32_t>\s+&i8;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<uint32_t>\s+&i16;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<uint32_t>\s+&i32;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<uint64_t>\s+&i64;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_biguint<65>\s>\s+&i65;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_biguint<128>\s>\s+&i128;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_bv<513>\s>\s+&i513;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_bv<1>\s>\s+&ibv1;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_bv<16>\s>\s+&ibv16;/);
 
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<bool> \s+ &o1;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<uint32_t> \s+ &o8;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<uint32_t> \s+ &o16;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<uint32_t> \s+ &o32;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<uint64_t> \s+ &o64;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_biguint<65>\s> \s+ &o65;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_biguint<128>\s> \s+ &o128;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_bv<513>\s> \s+ &o513;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_bv<1>\s> \s+ &obv1;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_bv<16>\s> \s+ &obv16;/x);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<bool>\s+&o1;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<uint32_t>\s+&o8;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<uint32_t>\s+&o16;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<uint32_t>\s+&o32;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<uint64_t>\s+&o64;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_biguint<65>\s>\s+&o65;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_biguint<128>\s>\s+&o128;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_bv<513>\s>\s+&o513;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_bv<1>\s>\s+&obv1;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_bv<16>\s>\s+&obv16;/);
 }
 
 execute();
diff --git a/test_regress/t/t_var_pins_sc_uint.pl b/test_regress/t/t_var_pins_sc_uint.pl
index 70333a0b5..b69cbd08c 100755
--- a/test_regress/t/t_var_pins_sc_uint.pl
+++ b/test_regress/t/t_var_pins_sc_uint.pl
@@ -18,27 +18,27 @@ compile(
     );
 
 {
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<bool> \s+ &i1;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_uint<8>\s> \s+ &i8;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_uint<16>\s> \s+ &i16;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_uint<32>\s> \s+ &i32;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_uint<64>\s> \s+ &i64;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_bv<65>\s> \s+ &i65;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_bv<128>\s> \s+ &i128;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_bv<513>\s> \s+ &i513;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_bv<1>\s> \s+ &ibv1;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_bv<16>\s> \s+ &ibv16;/x);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<bool>\s+&i1;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_uint<8>\s>\s+&i8;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_uint<16>\s>\s+&i16;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_uint<32>\s>\s+&i32;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_uint<64>\s>\s+&i64;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_bv<65>\s>\s+&i65;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_bv<128>\s>\s+&i128;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_bv<513>\s>\s+&i513;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_bv<1>\s>\s+&ibv1;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_bv<16>\s>\s+&ibv16;/);
 
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<bool> \s+ &o1;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_uint<8>\s> \s+ &o8;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_uint<16>\s> \s+ &o16;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_uint<32>\s> \s+ &o32;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_uint<64>\s> \s+ &o64;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_bv<65>\s> \s+ &o65;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_bv<128>\s> \s+ &o128;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_bv<513>\s> \s+ &o513;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_bv<1>\s> \s+ &obv1;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_bv<16>\s> \s+ &obv16;/x);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<bool>\s+&o1;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_uint<8>\s>\s+&o8;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_uint<16>\s>\s+&o16;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_uint<32>\s>\s+&o32;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_uint<64>\s>\s+&o64;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_bv<65>\s>\s+&o65;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_bv<128>\s>\s+&o128;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_bv<513>\s>\s+&o513;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_bv<1>\s>\s+&obv1;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_bv<16>\s>\s+&obv16;/);
 }
 
 execute();
diff --git a/test_regress/t/t_var_pins_sc_uint_biguint.pl b/test_regress/t/t_var_pins_sc_uint_biguint.pl
index 480eca2b4..3f0197b8e 100755
--- a/test_regress/t/t_var_pins_sc_uint_biguint.pl
+++ b/test_regress/t/t_var_pins_sc_uint_biguint.pl
@@ -18,27 +18,27 @@ compile(
     );
 
 {
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<bool> \s+ &i1;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_uint<8>\s> \s+ &i8;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_uint<16>\s> \s+ &i16;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_uint<32>\s> \s+ &i32;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_uint<64>\s> \s+ &i64;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_biguint<65>\s> \s+ &i65;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_biguint<128>\s> \s+ &i128;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_bv<513>\s> \s+ &i513;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_bv<1>\s> \s+ &ibv1;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_bv<16>\s> \s+ &ibv16;/x);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<bool>\s+&i1;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_uint<8>\s>\s+&i8;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_uint<16>\s>\s+&i16;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_uint<32>\s>\s+&i32;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_uint<64>\s>\s+&i64;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_biguint<65>\s>\s+&i65;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_biguint<128>\s>\s+&i128;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_bv<513>\s>\s+&i513;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_bv<1>\s>\s+&ibv1;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_bv<16>\s>\s+&ibv16;/);
 
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<bool> \s+ &o1;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_uint<8>\s> \s+ &o8;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_uint<16>\s> \s+ &o16;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_uint<32>\s> \s+ &o32;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_uint<64>\s> \s+ &o64;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_biguint<65>\s> \s+ &o65;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_biguint<128>\s> \s+ &o128;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_bv<513>\s> \s+ &o513;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_bv<1>\s> \s+ &obv1;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_bv<16>\s> \s+ &obv16;/x);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<bool>\s+&o1;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_uint<8>\s>\s+&o8;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_uint<16>\s>\s+&o16;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_uint<32>\s>\s+&o32;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_uint<64>\s>\s+&o64;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_biguint<65>\s>\s+&o65;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_biguint<128>\s>\s+&o128;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_bv<513>\s>\s+&o513;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_bv<1>\s>\s+&obv1;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_bv<16>\s>\s+&obv16;/);
 }
 
 execute();
diff --git a/test_regress/t/t_var_pins_sc_uint_bool.pl b/test_regress/t/t_var_pins_sc_uint_bool.pl
index 05a4dd4d3..db6bdbd22 100755
--- a/test_regress/t/t_var_pins_sc_uint_bool.pl
+++ b/test_regress/t/t_var_pins_sc_uint_bool.pl
@@ -18,23 +18,23 @@ compile(
     );
 
 {
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_uint<1>\s> \s+ &i1;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<uint32_t> \s+ &i8;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<uint32_t> \s+ &i16;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<uint32_t> \s+ &i32;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<uint64_t> \s+ &i64;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_bv<65>\s> \s+ &i65;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_bv<128>\s> \s+ &i128;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_bv<513>\s> \s+ &i513;/x);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_uint<1>\s>\s+&i1;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<uint32_t>\s+&i8;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<uint32_t>\s+&i16;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<uint32_t>\s+&i32;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<uint64_t>\s+&i64;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_bv<65>\s>\s+&i65;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_bv<128>\s>\s+&i128;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_bv<513>\s>\s+&i513;/);
 
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_uint<1>\s> \s+ &o1;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<uint32_t> \s+ &o8;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<uint32_t> \s+ &o16;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<uint32_t> \s+ &o32;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<uint64_t> \s+ &o64;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_bv<65>\s> \s+ &o65;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_bv<128>\s> \s+ &o128;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_bv<513>\s> \s+ &o513;/x);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_uint<1>\s>\s+&o1;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<uint32_t>\s+&o8;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<uint32_t>\s+&o16;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<uint32_t>\s+&o32;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<uint64_t>\s+&o64;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_bv<65>\s>\s+&o65;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_bv<128>\s>\s+&o128;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_bv<513>\s>\s+&o513;/);
 }
 
 execute();
diff --git a/test_regress/t/t_var_pins_scui.pl b/test_regress/t/t_var_pins_scui.pl
index 124313eea..1fbdc4de7 100755
--- a/test_regress/t/t_var_pins_scui.pl
+++ b/test_regress/t/t_var_pins_scui.pl
@@ -18,23 +18,23 @@ compile(
     );
 
 if ($Self->{vlt_all}) {
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<bool> \s+ &i1;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<uint8_t> \s+ &i8;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<uint16_t> \s+ &i16;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<uint32_t> \s+ &i32;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<uint64_t> \s+ &i64;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_bv<65>\s> \s+ &i65;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_bv<1>\s> \s+ &ibv1;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_bv<16>\s> \s+ &ibv16;/x);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<bool>\s+&i1;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<uint8_t>\s+&i8;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<uint16_t>\s+&i16;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<uint32_t>\s+&i32;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<uint64_t>\s+&i64;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_bv<65>\s>\s+&i65;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_bv<1>\s>\s+&ibv1;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_in<sc_dt::sc_bv<16>\s>\s+&ibv16;/);
 
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<bool> \s+ &o1;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<uint8_t> \s+ &o8;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<uint16_t> \s+ &o16;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<uint32_t> \s+ &o32;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<uint64_t> \s+ &o64;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_bv<65>\s> \s+ &o65;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_bv<1>\s> \s+ &obv1;/x);
-    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_bv<16>\s> \s+ &obv16;/x);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<bool>\s+&o1;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<uint8_t>\s+&o8;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<uint16_t>\s+&o16;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<uint32_t>\s+&o32;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<uint64_t>\s+&o64;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_bv<65>\s>\s+&o65;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_bv<1>\s>\s+&obv1;/);
+    file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_core::sc_out<sc_dt::sc_bv<16>\s>\s+&obv16;/);
 }
 
 execute();
diff --git a/test_regress/t/t_vpi_release_dup_bad.pl b/test_regress/t/t_vpi_release_dup_bad.pl
index 2fa1154c0..66aceab2e 100755
--- a/test_regress/t/t_vpi_release_dup_bad.pl
+++ b/test_regress/t/t_vpi_release_dup_bad.pl
@@ -19,7 +19,7 @@ execute(
     fails => 1,
     );
 
-file_grep($Self->{run_log_filename}, qr/vpi_release_handle.*called on same object twice/i);
+file_grep($Self->{run_log_filename}, qr/vpi_release_handle.*called on same object twice/);
 
 ok(1);
 
diff --git a/test_regress/t/t_xml_debugcheck.pl b/test_regress/t/t_xml_debugcheck.pl
index 1894252fe..78c58fd99 100755
--- a/test_regress/t/t_xml_debugcheck.pl
+++ b/test_regress/t/t_xml_debugcheck.pl
@@ -25,13 +25,13 @@ files_identical("$out_filename", $Self->{golden_filename}, 'logfile');
 
 # make sure that certain tags are present in --debug-check
 # that would not be present in --xml-only
-file_grep("$out_filename", qr/<constpool /x);
-file_grep("$out_filename", qr/<inititem /x);
-file_grep("$out_filename", qr/<if /x);
-file_grep("$out_filename", qr/<while /x);
-file_grep("$out_filename", qr/<begin>/x);  # for <if> and <while>
-file_grep("$out_filename", qr/ signed=/x);  # for <basicdtype>
-file_grep("$out_filename", qr/ func=/x);  # for <ccall>
+file_grep("$out_filename", qr/<constpool/);
+file_grep("$out_filename", qr/<inititem/);
+file_grep("$out_filename", qr/<if/);
+file_grep("$out_filename", qr/<while/);
+file_grep("$out_filename", qr/<begin>/);  # for <if> and <while>
+file_grep("$out_filename", qr/ signed=/);  # for <basicdtype>
+file_grep("$out_filename", qr/ func=/);  # for <ccall>
 
 ok(1);
 1;