diff --git a/src/V3Assert.cpp b/src/V3Assert.cpp
index cbf462260..a6264b46a 100644
--- a/src/V3Assert.cpp
+++ b/src/V3Assert.cpp
@@ -1072,11 +1072,7 @@ class AssertVisitor final : public VNVisitor {
                         = new AstSenItem{fl, VEdgeType::ET_CHANGED,
                                          // Clone so get VarRef or VarXRef as needed
                                          varrefp->cloneTree(false)};
-                    if (!monSenItemsp) {
-                        monSenItemsp = senItemp;
-                    } else {
-                        monSenItemsp->addNext(senItemp);
-                    }
+                    monSenItemsp = AstNode::addNextNull(monSenItemsp, senItemp);
                 });
             }
 
diff --git a/src/V3AssertPre.cpp b/src/V3AssertPre.cpp
index d9332ff59..5e6931c71 100644
--- a/src/V3AssertPre.cpp
+++ b/src/V3AssertPre.cpp
@@ -1203,11 +1203,7 @@ private:
                     AstNode* const nextp = stmtp->nextp();
                     if (AstAssign* const assignp = VN_CAST(stmtp, Assign)) {
                         assignp->unlinkFrBack();
-                        if (!matchAssignsp) {
-                            matchAssignsp = assignp;
-                        } else {
-                            matchAssignsp->addNext(assignp);
-                        }
+                        matchAssignsp = AstNode::addNextNull(matchAssignsp, assignp);
                     }
                     stmtp = nextp;
                 }
@@ -1233,11 +1229,7 @@ private:
                         AstNodeExpr* const assignRhsp = assignp->rhsp()->unlinkFrBack();
                         AstAssignDly* const dlyp = new AstAssignDly{flp, assignLhsp, assignRhsp};
                         VL_DO_DANGLING(pushDeletep(assignp), assignp);
-                        if (!matchAssignsp) {
-                            matchAssignsp = dlyp;
-                        } else {
-                            matchAssignsp->addNext(dlyp);
-                        }
+                        matchAssignsp = AstNode::addNextNull(matchAssignsp, dlyp);
                     }
                     stmtp = nextp;
                 }
diff --git a/src/V3Inst.cpp b/src/V3Inst.cpp
index befe8b05b..dba4ee5c5 100644
--- a/src/V3Inst.cpp
+++ b/src/V3Inst.cpp
@@ -557,11 +557,7 @@ private:
                         varNewp->origName(varNewp->origName() + portSuffix);
                         varNewp->dtypep(portIrp);
                         m_deModVars.insert(varNewp);
-                        if (!prevp) {
-                            prevp = varNewp;
-                        } else {
-                            prevp->addNextHere(varNewp);
-                        }
+                        prevp = AstNode::addNextNull(prevp, varNewp);
                     }
                     if (!varNewp) {
                         if (debug() >= 9) m_deModVars.dump();  // LCOV_EXCL_LINE
@@ -576,11 +572,7 @@ private:
                     newVarXRefp->varp(newp->modVarp());
                     newp->exprp()->unlinkFrBack()->deleteTree();
                     newp->exprp(newVarXRefp);
-                    if (!prevPinp) {
-                        prevPinp = newp;
-                    } else {
-                        prevPinp->addNextHere(newp);
-                    }
+                    prevPinp = AstNode::addNextNull(prevPinp, newp);
                 }
                 if (prevp) {
                     pinVarp->replaceWith(prevp);
@@ -616,11 +608,7 @@ private:
                     varNewp->origName(varNewp->origName() + "__BRA__" + cvtToStr(i) + "__KET__");
                     varNewp->dtypep(ifaceRefp);
                     m_deModVars.insert(varNewp);
-                    if (!prevp) {
-                        prevp = varNewp;
-                    } else {
-                        prevp->addNextHere(varNewp);
-                    }
+                    prevp = AstNode::addNextNull(prevp, varNewp);
                 }
                 if (!varNewp) {
                     if (debug() >= 9) m_deModVars.dump();  // LCOV_EXCL_LINE
@@ -658,11 +646,7 @@ private:
                 newVarXRefp->varp(newp->modVarp());
                 newp->exprp()->unlinkFrBack()->deleteTree();
                 newp->exprp(newVarXRefp);
-                if (!prevPinp) {
-                    prevPinp = newp;
-                } else {
-                    prevPinp->addNextHere(newp);
-                }
+                prevPinp = AstNode::addNextNull(prevPinp, newp);
             }
             if (prevp) {
                 pinVarp->replaceWith(prevp);
diff --git a/src/V3UnrollGen.cpp b/src/V3UnrollGen.cpp
index 658eac07e..3d2684150 100644
--- a/src/V3UnrollGen.cpp
+++ b/src/V3UnrollGen.cpp
@@ -224,11 +224,7 @@ class UnrollGenVisitor final : public VNVisitor {
                     const string nname = m_beginName + "__BRA__" + index + "__KET__";
                     oneloopp = new AstGenBlock{oneloopp->fileline(), nname, oneloopp, false};
                     VL_DO_DANGLING(pushDeletep(varValuep), varValuep);
-                    if (newbodysp) {
-                        newbodysp->addNext(oneloopp);
-                    } else {
-                        newbodysp = oneloopp;
-                    }
+                    newbodysp = AstNode::addNextNull(newbodysp, oneloopp);
 
                     // loopValue += valInc
                     const AstAssign* const incpass = VN_AS(incp, Assign);