diff --git a/src/V3Hashed.cpp b/src/V3Hashed.cpp
index c24cd739e..0724751fd 100644
--- a/src/V3Hashed.cpp
+++ b/src/V3Hashed.cpp
@@ -189,3 +189,4 @@ V3Hashed::iterator V3Hashed::findDuplicate(AstNode* nodep) {
     }
     return end();
 }
+
diff --git a/src/V3Hashed.h b/src/V3Hashed.h
index 1780f25b1..99fe878bd 100644
--- a/src/V3Hashed.h
+++ b/src/V3Hashed.h
@@ -31,7 +31,23 @@
 
 //============================================================================
 
-class V3Hashed {
+class VHashedBase {
+public:
+    // CONSTRUCTORS
+    VHashedBase() {}
+    ~VHashedBase() {}
+
+    // METHODS
+    static int debug() {
+	static int level = -1;
+	if (VL_UNLIKELY(level < 0)) level = v3Global.opt.debugSrcLevel(__FILE__);
+	return level;
+    }
+};
+
+//============================================================================
+
+class V3Hashed : public VHashedBase {
     // NODE STATE
     //  AstNode::user4()	-> V3Hash.  Hash value of this node (hash of 0 is illegal)
     AstUser4InUse	m_inuser4;
@@ -55,11 +71,6 @@ public:
     iterator end() { return m_hashMmap.end(); }
 
     // METHODS
-    static int debug() {
-	static int level = -1;
-	if (VL_UNLIKELY(level < 0)) level = v3Global.opt.debugSrcLevel(__FILE__);
-	return level;
-    }
     void clear() { m_hashMmap.clear(); AstNode::user4ClearTree(); }
     void hashAndInsert(AstNode* nodep);	// Hash the node, and insert into map
     bool sameNodes(AstNode* node1p, AstNode* node2p);	// After hashing, and tell if identical
diff --git a/test_regress/t/t_dist_portability.pl b/test_regress/t/t_dist_portability.pl
index 67dff9619..b0ae117ac 100755
--- a/test_regress/t/t_dist_portability.pl
+++ b/test_regress/t/t_dist_portability.pl
@@ -53,7 +53,7 @@ sub printfll {
     my $grep = `$cmd`;
     my %names;
     foreach my $line (split /\n/, $grep) {
-	next if $line !~ /%[^ ]*ll/;
+	next if $line !~ /%[a-z0-9]*ll/;
 	if ($line =~ /^([^:]+)/) {
 	    $names{$1} = 1;
 	    print "$line\n";
diff --git a/test_regress/t/t_mem_packed_assign_bad.pl b/test_regress/t/t_mem_packed_assign_bad.pl
index 3b1a6a92d..82341a4ed 100755
--- a/test_regress/t/t_mem_packed_assign_bad.pl
+++ b/test_regress/t/t_mem_packed_assign_bad.pl
@@ -12,8 +12,7 @@ compile (
 	 fails=>1,
 	 expect=>
 '%Error: t/t_mem_packed_assign_bad.v:\d+: Unsupported: Assignment between packed arrays of different dimensions
-%Error: t/t_mem_packed_assign_bad.v:\d+: Unsupported: Assignment between packed arrays of different dimensions
-%Error: Exiting due to.*',
+.*',
 	 );
 
 ok(1);