diff --git a/src/V3AstNodeDType.h b/src/V3AstNodeDType.h
index 9ed2b109c..c51a0df8d 100644
--- a/src/V3AstNodeDType.h
+++ b/src/V3AstNodeDType.h
@@ -51,7 +51,7 @@ protected:
 private:
     // METHODS
     const AstNodeDType* skipRefIterp(bool skipConst, bool skipEnum,
-                                     bool assert = true) const VL_MT_STABLE;
+                                     bool assertOn = true) const VL_MT_STABLE;
 
 protected:
     // METHODS
diff --git a/src/V3AstNodes.cpp b/src/V3AstNodes.cpp
index d86b164f7..62db4bbc9 100644
--- a/src/V3AstNodes.cpp
+++ b/src/V3AstNodes.cpp
@@ -830,7 +830,7 @@ AstVar* AstVar::scVarRecurse(AstNode* nodep) {
 }
 
 const AstNodeDType* AstNodeDType::skipRefIterp(bool skipConst, bool skipEnum,
-                                               bool assert) const VL_MT_STABLE {
+                                               bool assertOn) const VL_MT_STABLE {
     const AstNodeDType* nodep = this;
     while (true) {
         if (VL_UNLIKELY(VN_IS(nodep, MemberDType) || VN_IS(nodep, ParamTypeDType)
@@ -841,7 +841,7 @@ const AstNodeDType* AstNodeDType::skipRefIterp(bool skipConst, bool skipEnum,
                 nodep = subp;
                 continue;
             } else {
-                if (assert) nodep->v3fatalSrc(nodep->prettyTypeName() << " not linked to type");
+                if (assertOn) nodep->v3fatalSrc(nodep->prettyTypeName() << " not linked to type");
                 return nullptr;
             }
         }
diff --git a/src/V3LinkDot.cpp b/src/V3LinkDot.cpp
index e2c5fda2a..b34d7ac57 100644
--- a/src/V3LinkDot.cpp
+++ b/src/V3LinkDot.cpp
@@ -2762,7 +2762,7 @@ class LinkDotResolveVisitor final : public VNVisitor {
                 if (!lhsp->classOrPackageSkipp() && lhsp->name() != "local::") {
                     revisitLater(nodep);
                     m_ds = lastStates;
-                    if (auto* ftaskrefp = VN_CAST(nodep->rhsp(), NodeFTaskRef)) {
+                    if (AstNodeFTaskRef* const ftaskrefp = VN_CAST(nodep->rhsp(), NodeFTaskRef)) {
                         iterateAndNextNull(ftaskrefp->pinsp());
                     }
                     return;
@@ -2771,7 +2771,8 @@ class LinkDotResolveVisitor final : public VNVisitor {
                 // nodep->lhsp() may be a new node
                 if (AstClassOrPackageRef* const classOrPackageRefp
                     = VN_CAST(nodep->lhsp(), ClassOrPackageRef)) {
-                    if (AstNode* classOrPackageNodep = classOrPackageRefp->classOrPackageSkipp()) {
+                    if (AstNode* const classOrPackageNodep
+                        = classOrPackageRefp->classOrPackageSkipp()) {
                         m_ds.m_dotSymp = m_statep->getNodeSym(classOrPackageNodep);
                     }
                 }
@@ -2787,7 +2788,8 @@ class LinkDotResolveVisitor final : public VNVisitor {
                     if (!crefp->classOrPackageSkipp()) {
                         revisitLater(nodep);
                         m_ds = lastStates;
-                        if (auto* ftaskrefp = VN_CAST(nodep->rhsp(), NodeFTaskRef)) {
+                        if (AstNodeFTaskRef* const ftaskrefp
+                            = VN_CAST(nodep->rhsp(), NodeFTaskRef)) {
                             iterateAndNextNull(ftaskrefp->pinsp());
                         }
                         return;
@@ -2795,7 +2797,7 @@ class LinkDotResolveVisitor final : public VNVisitor {
                 }
                 if (m_lastDeferredp == nodep->lhsp()) {
                     m_ds = lastStates;
-                    if (auto* ftaskrefp = VN_CAST(nodep->rhsp(), NodeFTaskRef)) {
+                    if (AstNodeFTaskRef* const ftaskrefp = VN_CAST(nodep->rhsp(), NodeFTaskRef)) {
                         iterateAndNextNull(ftaskrefp->pinsp());
                     }
                     return;
@@ -4385,7 +4387,7 @@ public:
         : m_statep{statep} {
         UINFO(4, __FUNCTION__ << ": " << endl);
         iterate(rootp);
-        auto modulesToRevisit = std::move(m_modulesToRevisit);
+        std::map<std::string, AstNodeModule*> modulesToRevisit = std::move(m_modulesToRevisit);
         m_lastDeferredp = nullptr;
         for (auto& p : modulesToRevisit) {
             AstNodeModule* const modp = p.second;