diff --git a/src/V3Ast.cpp b/src/V3Ast.cpp
index d9d89339b..d23eba353 100644
--- a/src/V3Ast.cpp
+++ b/src/V3Ast.cpp
@@ -291,8 +291,8 @@ void AstNode::addNextHere(AstNode* newp) {
     //  This could be at head, tail, or both (single)
     //  New  could be head of single node, or list
     UDEBUGONLY(UASSERT(dynamic_cast<AstNode*>(this),"this should not be NULL"););
-    UASSERT(newp,"Null item passed to addNext");
-    UASSERT(newp->backp()==NULL,"New node (back) already assigned?");
+    UASSERT(newp, "Null item passed to addNext");
+    UASSERT(!newp->backp(), "New node (back) already assigned?");
     this->debugTreeChange("-addHereThs: ", __LINE__, false);
     newp->debugTreeChange("-addHereNew: ", __LINE__, true);
     newp->editCountInc();
@@ -335,7 +335,7 @@ void AstNode::addNextHere(AstNode* newp) {
 }
 
 void AstNode::setOp1p(AstNode* newp) {
-    UASSERT(newp,"Null item passed to setOp1p\n");
+    UASSERT(newp, "Null item passed to setOp1p");
     UDEBUGONLY(if (m_op1p) this->v3fatalSrc("Adding to non-empty, non-list op1"););
     UDEBUGONLY(if (newp->m_backp) newp->v3fatalSrc("Adding already linked node"););
     UDEBUGONLY(if (newp->m_nextp) newp->v3fatalSrc("Adding list to non-list op1"););
@@ -348,7 +348,7 @@ void AstNode::setOp1p(AstNode* newp) {
 }
 
 void AstNode::setOp2p(AstNode* newp) {
-    UASSERT(newp,"Null item passed to setOp2p\n");
+    UASSERT(newp, "Null item passed to setOp2p");
     UDEBUGONLY(if (m_op2p) this->v3fatalSrc("Adding to non-empty, non-list op2"););
     UDEBUGONLY(if (newp->m_backp) newp->v3fatalSrc("Adding already linked node"););
     UDEBUGONLY(if (newp->m_nextp) newp->v3fatalSrc("Adding list to non-list op2"););
@@ -361,7 +361,7 @@ void AstNode::setOp2p(AstNode* newp) {
 }
 
 void AstNode::setOp3p(AstNode* newp) {
-    UASSERT(newp,"Null item passed to setOp3p\n");
+    UASSERT(newp, "Null item passed to setOp3p");
     UDEBUGONLY(if (m_op3p) this->v3fatalSrc("Adding to non-empty, non-list op3"););
     UDEBUGONLY(if (newp->m_backp) newp->v3fatalSrc("Adding already linked node"););
     UDEBUGONLY(if (newp->m_nextp) newp->v3fatalSrc("Adding list to non-list op3"););
@@ -374,7 +374,7 @@ void AstNode::setOp3p(AstNode* newp) {
 }
 
 void AstNode::setOp4p(AstNode* newp) {
-    UASSERT(newp,"Null item passed to setOp4p\n");
+    UASSERT(newp, "Null item passed to setOp4p");
     UDEBUGONLY(if (m_op4p) this->v3fatalSrc("Adding to non-empty, non-list op4"););
     UDEBUGONLY(if (newp->m_backp) newp->v3fatalSrc("Adding already linked node"););
     UDEBUGONLY(if (newp->m_nextp) newp->v3fatalSrc("Adding list to non-list op4"););
@@ -387,25 +387,25 @@ void AstNode::setOp4p(AstNode* newp) {
 }
 
 void AstNode::addOp1p(AstNode* newp) {
-    UASSERT(newp,"Null item passed to addOp1p\n");
+    UASSERT(newp, "Null item passed to addOp1p");
     if (!m_op1p) { op1p(newp); }
     else { m_op1p->addNext(newp); }
 }
 
 void AstNode::addOp2p(AstNode* newp) {
-    UASSERT(newp,"Null item passed to addOp2p\n");
+    UASSERT(newp, "Null item passed to addOp2p");
     if (!m_op2p) { op2p(newp); }
     else { m_op2p->addNext(newp); }
 }
 
 void AstNode::addOp3p(AstNode* newp) {
-    UASSERT(newp,"Null item passed to addOp3p\n");
+    UASSERT(newp, "Null item passed to addOp3p");
     if (!m_op3p) { op3p(newp); }
     else { m_op3p->addNext(newp); }
 }
 
 void AstNode::addOp4p(AstNode* newp) {
-    UASSERT(newp,"Null item passed to addOp4p\n");
+    UASSERT(newp, "Null item passed to addOp4p");
     if (!m_op4p) { op4p(newp); }
     else { m_op4p->addNext(newp); }
 }
@@ -431,7 +431,7 @@ void AstNRelinker::dump(ostream& str) const {
 AstNode* AstNode::unlinkFrBackWithNext(AstNRelinker* linkerp) {
     this->debugTreeChange("-unlinkWNextThs: ", __LINE__, true);
     AstNode* oldp = this;
-    UASSERT(oldp->m_backp,"Node has no back, already unlinked?\n");
+    UASSERT(oldp->m_backp, "Node has no back, already unlinked?");
     oldp->editCountInc();
     AstNode* backp = oldp->m_backp;
     if (linkerp) {
@@ -479,7 +479,7 @@ AstNode* AstNode::unlinkFrBackWithNext(AstNRelinker* linkerp) {
 AstNode* AstNode::unlinkFrBack(AstNRelinker* linkerp) {
     this->debugTreeChange("-unlinkFrBkThs: ", __LINE__, true);
     AstNode* oldp = this;
-    UASSERT(oldp->m_backp,"Node has no back, already unlinked?\n");
+    UASSERT(oldp->m_backp, "Node has no back, already unlinked?");
     oldp->editCountInc();
     AstNode* backp = oldp->m_backp;
     if (linkerp) {
@@ -531,8 +531,8 @@ AstNode* AstNode::unlinkFrBack(AstNRelinker* linkerp) {
 void AstNode::relink(AstNRelinker* linkerp) {
     if (debug()>8) {	UINFO(0," EDIT:      relink: "); dumpPtrs();    }
     AstNode* newp = this;
-    UASSERT(linkerp && linkerp->m_backp, "Need non-empty linker\n");
-    UASSERT(newp->backp()==NULL, "New node already linked?\n");
+    UASSERT(linkerp && linkerp->m_backp, "Need non-empty linker");
+    UASSERT(!newp->backp(), "New node already linked?");
     newp->editCountInc();
 
     if (debug()>8) { linkerp->dump(cout); cout<<endl; }
@@ -668,7 +668,7 @@ AstNode* AstNode::cloneTree(bool cloneNextLink) {
 
 void AstNode::deleteNode() {
     // private: Delete single node. Publicly call deleteTree() instead.
-    UASSERT(m_backp==NULL,"Delete called on node with backlink still set\n");
+    UASSERT(!m_backp, "Delete called on node with backlink still set");
     editCountInc();
     // Change links of old node so we coredump if used
     this->m_nextp = (AstNode*)1;
@@ -713,7 +713,7 @@ void AstNode::deleteTreeIter() {
 void AstNode::deleteTree() {
     // deleteTree always deletes the next link, because you must have called
     // unlinkFromBack or unlinkFromBackWithNext as appropriate before calling this.
-    UASSERT(m_backp==NULL,"Delete called on node with backlink still set\n");
+    UASSERT(!m_backp, "Delete called on node with backlink still set");
     this->debugTreeChange("-delTree:  ", __LINE__, true);
     this->editCountInc();
     // MUST be depth first!
diff --git a/src/V3Const.cpp b/src/V3Const.cpp
index ba26d5e98..8d451d422 100644
--- a/src/V3Const.cpp
+++ b/src/V3Const.cpp
@@ -589,7 +589,7 @@ private:
 
     void replaceNum (AstNode* oldp, const V3Number& num) {
 	// Replace oldp node with a constant set to specified value
-	UASSERT (oldp, "Null old\n");
+        UASSERT(oldp, "Null old");
 	if (oldp->castConst() && !oldp->castConst()->num().isFourState()) {
 	    oldp->v3fatalSrc("Already constant??");
 	}
@@ -662,7 +662,7 @@ private:
 
     void replaceConstString (AstNode* oldp, const string& num) {
 	// Replace oldp node with a constant set to specified value
-	UASSERT (oldp, "Null old\n");
+        UASSERT(oldp, "Null old");
 	AstNode* newp = new AstConst(oldp->fileline(), AstConst::String(), num);
 	if (debug()>5) oldp->dumpTree(cout,"  const_old: ");
 	if (debug()>5) newp->dumpTree(cout,"       _new: ");
diff --git a/src/V3Descope.cpp b/src/V3Descope.cpp
index e55a0f4bd..aea805d84 100644
--- a/src/V3Descope.cpp
+++ b/src/V3Descope.cpp
@@ -87,7 +87,7 @@ private:
     // false if the object is in another scope.
     string descopedName(const AstScope* scopep, bool& hierThisr,
                         const AstVar* varp=NULL) {
-	UASSERT(scopep, "Var/Func not scoped\n");
+        UASSERT(scopep, "Var/Func not scoped");
 	hierThisr = (scopep == m_scopep);
 
         // It's possible to disable relative references. This is a concession
diff --git a/src/V3File.h b/src/V3File.h
index 02fefebaf..f8a6e9763 100644
--- a/src/V3File.h
+++ b/src/V3File.h
@@ -152,7 +152,7 @@ public:
     void indentInc() { m_indentLevel += m_blockIndent; }
     void indentDec() {
 	m_indentLevel -= m_blockIndent;
-	UASSERT(m_indentLevel>=0, ": "<<m_filename<<": Underflow of indentation\n");
+        UASSERT(m_indentLevel>=0, ": "<<m_filename<<": Underflow of indentation");
     }
     void blockInc() { m_parenVec.push(m_indentLevel + m_blockIndent); }
     void blockDec() { if (!m_parenVec.empty()) m_parenVec.pop(); }
diff --git a/src/V3Graph.cpp b/src/V3Graph.cpp
index 16ce46cbe..bfcfd463b 100644
--- a/src/V3Graph.cpp
+++ b/src/V3Graph.cpp
@@ -133,8 +133,8 @@ ostream& operator<<(ostream& os, V3GraphVertex* vertexp) {
 void V3GraphEdge::init(V3Graph* graphp,
 		       V3GraphVertex* fromp, V3GraphVertex* top, int weight,
 		       bool cutable) {
-    UASSERT(fromp, "Null from pointer\n");
-    UASSERT(top, "Null to pointer\n");
+    UASSERT(fromp, "Null from pointer");
+    UASSERT(top, "Null to pointer");
     m_fromp = fromp;
     m_top = top;
     m_weight = weight;
diff --git a/src/V3Order.cpp b/src/V3Order.cpp
index 10d9aa21c..6950277ca 100644
--- a/src/V3Order.cpp
+++ b/src/V3Order.cpp
@@ -1162,7 +1162,7 @@ void OrderVisitor::processSensitive() {
 void OrderVisitor::processDomains() {
     for (V3GraphVertex* itp = m_graph.verticesBeginp(); itp; itp=itp->verticesNextp()) {
 	OrderEitherVertex* vertexp = dynamic_cast<OrderEitherVertex*>(itp);
-	UASSERT(vertexp, "Null or vertex not derived from EitherVertex\n");
+        UASSERT(vertexp, "Null or vertex not derived from EitherVertex");
 	processDomainsIterate(vertexp);
     }
 }
@@ -1509,7 +1509,7 @@ void OrderVisitor::processMoveDoneOne(OrderMoveVertex* vertexp) {
 }
 
 void OrderVisitor::processMoveOne(OrderMoveVertex* vertexp, OrderMoveDomScope* domScopep, int level) {
-    UASSERT(vertexp->domScopep() == domScopep, "Domain mismatch; list misbuilt?\n");
+    UASSERT(vertexp->domScopep() == domScopep, "Domain mismatch; list misbuilt?");
     OrderLogicVertex* lvertexp = vertexp->logicp();
     AstScope* scopep = lvertexp->scopep();
     UINFO(5,"    POSmove l"<<setw(3)<<level<<" d="<<(void*)(lvertexp->domainp())
diff --git a/src/V3OrderGraph.h b/src/V3OrderGraph.h
index 6cecfea56..c3ce2fac6 100644
--- a/src/V3OrderGraph.h
+++ b/src/V3OrderGraph.h
@@ -357,11 +357,11 @@ public:
     OrderLogicVertex* logicp() const { return m_logicp; }
     bool isWait() const { return m_state==POM_WAIT; }
     void setReady() {
-	UASSERT(m_state==POM_WAIT, "Wait->Ready on node not in proper state\n");
+        UASSERT(m_state==POM_WAIT, "Wait->Ready on node not in proper state");
 	m_state = POM_READY;
     }
     void setMoved() {
-	UASSERT(m_state==POM_READY, "Ready->Moved on node not in proper state\n");
+        UASSERT(m_state==POM_READY, "Ready->Moved on node not in proper state");
 	m_state = POM_MOVED;
     }
     OrderMoveDomScope* domScopep() const { return m_domScopep; }