diff --git a/src/V3Ast.h b/src/V3Ast.h
index c0b0cee97..9b0c14511 100644
--- a/src/V3Ast.h
+++ b/src/V3Ast.h
@@ -373,8 +373,8 @@ public:
 	return names[m_e];
     };
     static void selfTest() {
-	UASSERT(0==strcmp(AstBasicDTypeKwd(_ENUM_MAX).ascii()," MAX"),"Enum array mismatch");
-	UASSERT(0==strcmp(AstBasicDTypeKwd(_ENUM_MAX).dpiType()," MAX"),"Enum array mismatch");
+        UASSERT(0==strcmp(AstBasicDTypeKwd(_ENUM_MAX).ascii()," MAX"), "SelfTest: Enum mismatch");
+        UASSERT(0==strcmp(AstBasicDTypeKwd(_ENUM_MAX).dpiType()," MAX"),"SelfTest: Enum mismatch");
     }
     inline AstBasicDTypeKwd () : m_e(UNKNOWN) {}
     // cppcheck-suppress noExplicitConstructor
diff --git a/src/V3GraphTest.cpp b/src/V3GraphTest.cpp
index 4d64b3084..963e9b05a 100644
--- a/src/V3GraphTest.cpp
+++ b/src/V3GraphTest.cpp
@@ -119,9 +119,12 @@ public:
 	gp->stronglyConnected(&V3GraphEdge::followAlwaysTrue);
 	dump();
 
-	UASSERT(i->color()!=a->color() && a->color() != g2->color() && g2->color() != q->color(), "Separate colors not assigned");
-	UASSERT(a->color()==b->color() && a->color()==g1->color(), "Strongly connected nodes not colored together");
-	UASSERT(g2->color()==g3->color(), "Strongly connected nodes not colored together");
+        UASSERT(i->color()!=a->color() && a->color() != g2->color() && g2->color() != q->color(),
+                "SelfTest: Separate colors not assigned");
+        UASSERT(a->color()==b->color() && a->color()==g1->color(),
+                "SelfTest: Strongly connected nodes not colored together");
+        UASSERT(g2->color()==g3->color(),
+                "SelfTest: Strongly connected nodes not colored together");
     }
 };
 
diff --git a/src/V3OrderGraph.h b/src/V3OrderGraph.h
index c3ce2fac6..f0e9f322d 100644
--- a/src/V3OrderGraph.h
+++ b/src/V3OrderGraph.h
@@ -210,18 +210,17 @@ public:
 
 class OrderVarVertex : public OrderEitherVertex {
     AstVarScope* m_varScp;
-    OrderVarVertex*	m_pilNewVertexp;	// for processInsLoopNewVar
     bool	 m_isClock;	// Used as clock
     bool	 m_isDelayed;	// Set in a delayed assignment
 protected:
     OrderVarVertex(V3Graph* graphp, const OrderVarVertex& old)
 	: OrderEitherVertex(graphp, old)
-	, m_varScp(old.m_varScp), m_pilNewVertexp(old.m_pilNewVertexp), m_isClock(old.m_isClock)
+        , m_varScp(old.m_varScp), m_isClock(old.m_isClock)
 	, m_isDelayed(old.m_isDelayed) {}
 public:
     OrderVarVertex(V3Graph* graphp, AstScope* scopep, AstVarScope* varScp)
 	: OrderEitherVertex(graphp, scopep, NULL), m_varScp(varScp)
-	, m_pilNewVertexp(NULL), m_isClock(false), m_isDelayed(false) {}
+        , m_isClock(false), m_isDelayed(false) {}
     virtual ~OrderVarVertex() {}
     virtual OrderVarVertex* clone (V3Graph* graphp) const = 0;
     virtual OrderVEdgeType type() const = 0;
@@ -231,8 +230,6 @@ public:
     bool isClock() const { return m_isClock; }
     void isDelayed(bool flag) { m_isDelayed=flag; }
     bool isDelayed() const { return m_isDelayed; }
-    OrderVarVertex* pilNewVertexp() const { return m_pilNewVertexp; }
-    void pilNewVertexp (OrderVarVertex* vertexp) { m_pilNewVertexp = vertexp; }
 };
 
 class OrderVarStdVertex : public OrderVarVertex {
@@ -327,7 +324,7 @@ protected:
 	: V3GraphVertex(graphp, old), m_logicp(old.m_logicp), m_state(old.m_state)
 	, m_domScopep(old.m_domScopep) {}
 public:
-    OrderMoveVertex(V3Graph* graphp, OrderLogicVertex*	logicp)
+    OrderMoveVertex(V3Graph* graphp, OrderLogicVertex* logicp)
 	: V3GraphVertex(graphp), m_logicp(logicp), m_state(POM_WAIT), m_domScopep(NULL) {}
     virtual ~OrderMoveVertex() {}
     virtual OrderMoveVertex* clone(V3Graph* graphp) const {
diff --git a/src/V3Param.cpp b/src/V3Param.cpp
index 30ccf90bf..2bd36a236 100644
--- a/src/V3Param.cpp
+++ b/src/V3Param.cpp
@@ -193,12 +193,16 @@ private:
 		// Find it in the clone structure
 		//UINFO(8,"Clone find 0x"<<hex<<(uint32_t)pinp->modVarp()<<endl);
 		CloneMap::iterator cloneiter = clonemapp->find(pinp->modVarp());
-		UASSERT(cloneiter != clonemapp->end(), "Couldn't find pin in clone list");
+                if (cloneiter == clonemapp->end()) {
+                    pinp->v3fatalSrc("Couldn't find pin in clone list");
+                }
                 pinp->modVarp(VN_CAST(cloneiter->second, Var));
 	    }
 	    else if (pinp->modPTypep()) {
 		CloneMap::iterator cloneiter = clonemapp->find(pinp->modPTypep());
-		UASSERT(cloneiter != clonemapp->end(), "Couldn't find pin in clone list");
+                if (cloneiter == clonemapp->end()) {
+                    pinp->v3fatalSrc("Couldn't find pin in clone list");
+                }
                 pinp->modPTypep(VN_CAST(cloneiter->second, ParamTypeDType));
 	    }
 	    else {