diff --git a/src/V3Active.cpp b/src/V3Active.cpp
index a797bb829..98d7f3273 100644
--- a/src/V3Active.cpp
+++ b/src/V3Active.cpp
@@ -437,6 +437,8 @@ public:
 
 void V3Active::activeAll(AstNetlist* nodep) {
     UINFO(2,__FUNCTION__<<": "<<endl);
-    ActiveVisitor visitor (nodep);
+    {
+        ActiveVisitor visitor (nodep);
+    }  // Destruct before checking
     V3Global::dumpCheckGlobalTree("active", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 3);
 }
diff --git a/src/V3ActiveTop.cpp b/src/V3ActiveTop.cpp
index 63b8d6cc9..8ba937e5e 100644
--- a/src/V3ActiveTop.cpp
+++ b/src/V3ActiveTop.cpp
@@ -159,6 +159,8 @@ public:
 
 void V3ActiveTop::activeTopAll(AstNetlist* nodep) {
     UINFO(2,__FUNCTION__<<": "<<endl);
-    ActiveTopVisitor visitor (nodep);
+    {
+        ActiveTopVisitor visitor (nodep);
+    }  // Destruct before checking
     V3Global::dumpCheckGlobalTree("activetop", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 3);
 }
diff --git a/src/V3Assert.cpp b/src/V3Assert.cpp
index 1092515d5..7b23a4e80 100644
--- a/src/V3Assert.cpp
+++ b/src/V3Assert.cpp
@@ -349,6 +349,8 @@ public:
 
 void V3Assert::assertAll(AstNetlist* nodep) {
     UINFO(2,__FUNCTION__<<": "<<endl);
-    AssertVisitor visitor (nodep);
+    {
+        AssertVisitor visitor (nodep);
+    }  // Destruct before checking
     V3Global::dumpCheckGlobalTree("assert", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 3);
 }
diff --git a/src/V3AssertPre.cpp b/src/V3AssertPre.cpp
index 513531d9e..20bfcd1ec 100644
--- a/src/V3AssertPre.cpp
+++ b/src/V3AssertPre.cpp
@@ -136,6 +136,8 @@ public:
 
 void V3AssertPre::assertPreAll(AstNetlist* nodep) {
     UINFO(2,__FUNCTION__<<": "<<endl);
-    AssertPreVisitor visitor (nodep);
+    {
+        AssertPreVisitor visitor (nodep);
+    }  // Destruct before checking
     V3Global::dumpCheckGlobalTree("assertpre", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 3);
 }
diff --git a/src/V3Begin.cpp b/src/V3Begin.cpp
index 35aacbcf3..ee3ec6f77 100644
--- a/src/V3Begin.cpp
+++ b/src/V3Begin.cpp
@@ -291,10 +291,12 @@ public:
 
 void V3Begin::debeginAll(AstNetlist* nodep) {
     UINFO(2,__FUNCTION__<<": "<<endl);
-    BeginState state;
-    { BeginVisitor bvisitor (nodep,&state); }
-    if (state.anyFuncInBegin()) {
-	BeginRelinkVisitor brvisitor (nodep,&state);
-    }
+    {
+        BeginState state;
+        { BeginVisitor bvisitor (nodep,&state); }
+        if (state.anyFuncInBegin()) {
+            BeginRelinkVisitor brvisitor (nodep,&state);
+        }
+    }  // Destruct before checking
     V3Global::dumpCheckGlobalTree("begin", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 3);
 }
diff --git a/src/V3Case.cpp b/src/V3Case.cpp
index c57c5dda7..97bb08f30 100644
--- a/src/V3Case.cpp
+++ b/src/V3Case.cpp
@@ -488,7 +488,9 @@ public:
 
 void V3Case::caseAll(AstNetlist* nodep) {
     UINFO(2,__FUNCTION__<<": "<<endl);
-    CaseVisitor visitor (nodep);
+    {
+        CaseVisitor visitor (nodep);
+    }  // Destruct before checking
     V3Global::dumpCheckGlobalTree("case", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 3);
 }
 void V3Case::caseLint(AstNodeCase* nodep) {
diff --git a/src/V3Cast.cpp b/src/V3Cast.cpp
index cf67d57d7..aca549cb7 100644
--- a/src/V3Cast.cpp
+++ b/src/V3Cast.cpp
@@ -187,6 +187,8 @@ public:
 
 void V3Cast::castAll(AstNetlist* nodep) {
     UINFO(2,__FUNCTION__<<": "<<endl);
-    CastVisitor visitor (nodep);
+    {
+        CastVisitor visitor (nodep);
+    }  // Destruct before checking
     V3Global::dumpCheckGlobalTree("cast", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 3);
 }
diff --git a/src/V3Changed.cpp b/src/V3Changed.cpp
index 0b5f22fac..f30486a85 100644
--- a/src/V3Changed.cpp
+++ b/src/V3Changed.cpp
@@ -300,7 +300,9 @@ public:
 
 void V3Changed::changedAll(AstNetlist* nodep) {
     UINFO(2,__FUNCTION__<<": "<<endl);
-    ChangedState state;
-    ChangedVisitor visitor (nodep, &state);
+    {
+        ChangedState state;
+        ChangedVisitor visitor (nodep, &state);
+    }  // Destruct before checking
     V3Global::dumpCheckGlobalTree("changed", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 3);
 }
diff --git a/src/V3Clean.cpp b/src/V3Clean.cpp
index 1b958d472..b5a8b251a 100644
--- a/src/V3Clean.cpp
+++ b/src/V3Clean.cpp
@@ -297,6 +297,8 @@ public:
 
 void V3Clean::cleanAll(AstNetlist* nodep) {
     UINFO(2,__FUNCTION__<<": "<<endl);
-    CleanVisitor visitor (nodep);
+    {
+        CleanVisitor visitor (nodep);
+    }  // Destruct before checking
     V3Global::dumpCheckGlobalTree("clean", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 3);
 }
diff --git a/src/V3ClkGater.cpp b/src/V3ClkGater.cpp
index cc0f1362b..b45a9d9a6 100644
--- a/src/V3ClkGater.cpp
+++ b/src/V3ClkGater.cpp
@@ -912,8 +912,10 @@ public:
 
 void V3ClkGater::clkGaterAll(AstNetlist* nodep) {
     UINFO(2,__FUNCTION__<<": "<<endl);
-    // While the gater does well at some modules, it seems to slow down many others
-    UINFO(5,"ClkGater is disabled due to performance issues\n");
+    {
+        // While the gater does well at some modules, it seems to slow down many others
+        UINFO(5,"ClkGater is disabled due to performance issues\n");
+    }  // Destruct before checking
     //GaterVisitor visitor (nodep);
     V3Global::dumpCheckGlobalTree("clkgater", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 3);
 }
diff --git a/src/V3Clock.cpp b/src/V3Clock.cpp
index e0e3528e3..dc2c6eaba 100644
--- a/src/V3Clock.cpp
+++ b/src/V3Clock.cpp
@@ -406,6 +406,8 @@ public:
 
 void V3Clock::clockAll(AstNetlist* nodep) {
     UINFO(2,__FUNCTION__<<": "<<endl);
-    ClockVisitor visitor (nodep);
+    {
+        ClockVisitor visitor (nodep);
+    }  // Destruct before checking
     V3Global::dumpCheckGlobalTree("clock", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 3);
 }
diff --git a/src/V3Combine.cpp b/src/V3Combine.cpp
index 780f93e55..9d5344480 100644
--- a/src/V3Combine.cpp
+++ b/src/V3Combine.cpp
@@ -473,6 +473,8 @@ public:
 
 void V3Combine::combineAll(AstNetlist* nodep) {
     UINFO(2,__FUNCTION__<<": "<<endl);
-    CombineVisitor visitor (nodep);
+    {
+        CombineVisitor visitor (nodep);
+    }  // Destruct before checking
     V3Global::dumpCheckGlobalTree("combine", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 3);
 }
diff --git a/src/V3Const.cpp b/src/V3Const.cpp
index 56293a1f2..89d3ceae2 100644
--- a/src/V3Const.cpp
+++ b/src/V3Const.cpp
@@ -2559,15 +2559,19 @@ AstNode* V3Const::constifyGenerateParamsEdit(AstNode* nodep) {
 void V3Const::constifyAllLint(AstNetlist* nodep) {
     // Only call from Verilator.cpp, as it uses user#'s
     UINFO(2,__FUNCTION__<<": "<<endl);
-    ConstVisitor visitor (ConstVisitor::PROC_V_WARN);
-    (void)visitor.mainAcceptEdit(nodep);
+    {
+        ConstVisitor visitor (ConstVisitor::PROC_V_WARN);
+        (void)visitor.mainAcceptEdit(nodep);
+    }  // Destruct before checking
     V3Global::dumpCheckGlobalTree("const", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 3);
 }
 
 void V3Const::constifyCpp(AstNetlist* nodep) {
     UINFO(2,__FUNCTION__<<": "<<endl);
-    ConstVisitor visitor (ConstVisitor::PROC_CPP);
-    (void)visitor.mainAcceptEdit(nodep);
+    {
+        ConstVisitor visitor (ConstVisitor::PROC_CPP);
+        (void)visitor.mainAcceptEdit(nodep);
+    }  // Destruct before checking
     V3Global::dumpCheckGlobalTree("const_cpp", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 3);
 }
 
@@ -2582,16 +2586,20 @@ void V3Const::constifyAllLive(AstNetlist* nodep) {
     // This only pushes constants up, doesn't make any other edits
     // IE doesn't prune dead statements, as we need to do some usability checks after this
     UINFO(2,__FUNCTION__<<": "<<endl);
-    ConstVisitor visitor (ConstVisitor::PROC_LIVE);
-    (void)visitor.mainAcceptEdit(nodep);
+    {
+        ConstVisitor visitor (ConstVisitor::PROC_LIVE);
+        (void)visitor.mainAcceptEdit(nodep);
+    }  // Destruct before checking
     V3Global::dumpCheckGlobalTree("const", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 3);
 }
 
 void V3Const::constifyAll(AstNetlist* nodep) {
     // Only call from Verilator.cpp, as it uses user#'s
     UINFO(2,__FUNCTION__<<": "<<endl);
-    ConstVisitor visitor (ConstVisitor::PROC_V_EXPENSIVE);
-    (void)visitor.mainAcceptEdit(nodep);
+    {
+        ConstVisitor visitor (ConstVisitor::PROC_V_EXPENSIVE);
+        (void)visitor.mainAcceptEdit(nodep);
+    }  // Destruct before checking
     V3Global::dumpCheckGlobalTree("const", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 3);
 }
 
diff --git a/src/V3Coverage.cpp b/src/V3Coverage.cpp
index 130ae1f26..414085dfd 100644
--- a/src/V3Coverage.cpp
+++ b/src/V3Coverage.cpp
@@ -395,6 +395,8 @@ public:
 
 void V3Coverage::coverage(AstNetlist* rootp) {
     UINFO(2,__FUNCTION__<<": "<<endl);
-    CoverageVisitor visitor (rootp);
+    {
+        CoverageVisitor visitor (rootp);
+    }  // Destruct before checking
     V3Global::dumpCheckGlobalTree("coverage", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 3);
 }
diff --git a/src/V3CoverageJoin.cpp b/src/V3CoverageJoin.cpp
index 620d44d5c..f9f522570 100644
--- a/src/V3CoverageJoin.cpp
+++ b/src/V3CoverageJoin.cpp
@@ -134,6 +134,8 @@ public:
 
 void V3CoverageJoin::coverageJoin(AstNetlist* rootp) {
     UINFO(2,__FUNCTION__<<": "<<endl);
-    CoverageJoinVisitor visitor (rootp);
+    {
+        CoverageJoinVisitor visitor (rootp);
+    }  // Destruct before checking
     V3Global::dumpCheckGlobalTree("coveragejoin", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 3);
 }
diff --git a/src/V3Dead.cpp b/src/V3Dead.cpp
index a5a75bb9f..42cbfcd2b 100644
--- a/src/V3Dead.cpp
+++ b/src/V3Dead.cpp
@@ -425,30 +425,40 @@ public:
 
 void V3Dead::deadifyModules(AstNetlist* nodep) {
     UINFO(2,__FUNCTION__<<": "<<endl);
-    DeadVisitor visitor (nodep, false, false, false, false);
+    {
+        DeadVisitor visitor (nodep, false, false, false, false);
+    }  // Destruct before checking
     V3Global::dumpCheckGlobalTree("deadModules", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 6);
 }
 
 void V3Dead::deadifyDTypes(AstNetlist* nodep) {
     UINFO(2,__FUNCTION__<<": "<<endl);
-    DeadVisitor visitor (nodep, false, true, false, false);
+    {
+        DeadVisitor visitor (nodep, false, true, false, false);
+    }  // Destruct before checking
     V3Global::dumpCheckGlobalTree("deadDtypes", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 3);
 }
 
 void V3Dead::deadifyDTypesScoped(AstNetlist* nodep) {
     UINFO(2,__FUNCTION__<<": "<<endl);
-    DeadVisitor visitor (nodep, false, true, true, false);
+    {
+        DeadVisitor visitor (nodep, false, true, true, false);
+    }  // Destruct before checking
     V3Global::dumpCheckGlobalTree("deadDtypesScoped", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 3);
 }
 
 void V3Dead::deadifyAll(AstNetlist* nodep) {
     UINFO(2,__FUNCTION__<<": "<<endl);
-    DeadVisitor visitor (nodep, true, true, false, true);
+    {
+        DeadVisitor visitor (nodep, true, true, false, true);
+    }  // Destruct before checking
     V3Global::dumpCheckGlobalTree("deadAll", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 3);
 }
 
 void V3Dead::deadifyAllScoped(AstNetlist* nodep) {
     UINFO(2,__FUNCTION__<<": "<<endl);
-    DeadVisitor visitor (nodep, true, true, true, true);
+    {
+        DeadVisitor visitor (nodep, true, true, true, true);
+    }  // Destruct before checking
     V3Global::dumpCheckGlobalTree("deadAllScoped", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 3);
 }
diff --git a/src/V3Delayed.cpp b/src/V3Delayed.cpp
index 20d2f7d02..e3496210b 100644
--- a/src/V3Delayed.cpp
+++ b/src/V3Delayed.cpp
@@ -470,6 +470,8 @@ public:
 
 void V3Delayed::delayedAll(AstNetlist* nodep) {
     UINFO(2,__FUNCTION__<<": "<<endl);
-    DelayedVisitor visitor (nodep);
+    {
+        DelayedVisitor visitor (nodep);
+    }  // Destruct before checking
     V3Global::dumpCheckGlobalTree("delayed", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 3);
 }
diff --git a/src/V3Depth.cpp b/src/V3Depth.cpp
index a0ae345f0..904dd6d1b 100644
--- a/src/V3Depth.cpp
+++ b/src/V3Depth.cpp
@@ -174,6 +174,8 @@ public:
 
 void V3Depth::depthAll(AstNetlist* nodep) {
     UINFO(2,__FUNCTION__<<": "<<endl);
-    DepthVisitor visitor (nodep);
+    {
+        DepthVisitor visitor (nodep);
+    }  // Destruct before checking
     V3Global::dumpCheckGlobalTree("depth", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 6);
 }
diff --git a/src/V3DepthBlock.cpp b/src/V3DepthBlock.cpp
index 90a7a962a..42792f250 100644
--- a/src/V3DepthBlock.cpp
+++ b/src/V3DepthBlock.cpp
@@ -139,6 +139,8 @@ public:
 
 void V3DepthBlock::depthBlockAll(AstNetlist* nodep) {
     UINFO(2,__FUNCTION__<<": "<<endl);
-    DepthBlockVisitor visitor (nodep);
+    {
+        DepthBlockVisitor visitor (nodep);
+    }  // Destruct before checking
     V3Global::dumpCheckGlobalTree("deepblock", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 3);
 }
diff --git a/src/V3Descope.cpp b/src/V3Descope.cpp
index e227feffc..e55a0f4bd 100644
--- a/src/V3Descope.cpp
+++ b/src/V3Descope.cpp
@@ -311,6 +311,8 @@ public:
 
 void V3Descope::descopeAll(AstNetlist* nodep) {
     UINFO(2,__FUNCTION__<<": "<<endl);
-    DescopeVisitor visitor (nodep);
+    {
+        DescopeVisitor visitor (nodep);
+    }  // Destruct before checking
     V3Global::dumpCheckGlobalTree("descope", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 3);
 }
diff --git a/src/V3Expand.cpp b/src/V3Expand.cpp
index 91659350e..850460837 100644
--- a/src/V3Expand.cpp
+++ b/src/V3Expand.cpp
@@ -936,6 +936,8 @@ public:
 
 void V3Expand::expandAll(AstNetlist* nodep) {
     UINFO(2,__FUNCTION__<<": "<<endl);
-    ExpandVisitor visitor (nodep);
+    {
+        ExpandVisitor visitor (nodep);
+    }  // Destruct before checking
     V3Global::dumpCheckGlobalTree("expand", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 3);
 }
diff --git a/src/V3Gate.cpp b/src/V3Gate.cpp
index 944bf34ee..5d6f045d1 100644
--- a/src/V3Gate.cpp
+++ b/src/V3Gate.cpp
@@ -1496,7 +1496,9 @@ public:
 
 void V3Gate::gateAll(AstNetlist* nodep) {
     UINFO(2,__FUNCTION__<<": "<<endl);
-    GateVisitor visitor (nodep);
-    GateDeassignVisitor deassign (nodep);
+    {
+        GateVisitor visitor (nodep);
+        GateDeassignVisitor deassign (nodep);
+    }  // Destruct before checking
     V3Global::dumpCheckGlobalTree("gate", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 3);
 }
diff --git a/src/V3GenClk.cpp b/src/V3GenClk.cpp
index a88339cd6..fa25812f6 100644
--- a/src/V3GenClk.cpp
+++ b/src/V3GenClk.cpp
@@ -242,6 +242,8 @@ public:
 
 void V3GenClk::genClkAll(AstNetlist* nodep) {
     UINFO(2,__FUNCTION__<<": "<<endl);
-    GenClkReadVisitor visitor (nodep);
+    {
+        GenClkReadVisitor visitor (nodep);
+    }  // Destruct before checking
     V3Global::dumpCheckGlobalTree("genclk", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 3);
 }
diff --git a/src/V3Inst.cpp b/src/V3Inst.cpp
index 910d53529..2beb728cd 100644
--- a/src/V3Inst.cpp
+++ b/src/V3Inst.cpp
@@ -582,12 +582,16 @@ AstAssignW* V3Inst::pinReconnectSimple(AstPin* pinp, AstCell* cellp, AstNodeModu
 
 void V3Inst::instAll(AstNetlist* nodep) {
     UINFO(2,__FUNCTION__<<": "<<endl);
-    InstVisitor visitor (nodep);
+    {
+        InstVisitor visitor (nodep);
+    }  // Destruct before checking
     V3Global::dumpCheckGlobalTree("inst", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 3);
 }
 
 void V3Inst::dearrayAll(AstNetlist* nodep) {
     UINFO(2,__FUNCTION__<<": "<<endl);
-    InstDeVisitor visitor (nodep);
+    {
+        InstDeVisitor visitor (nodep);
+    }  // Destruct before checking
     V3Global::dumpCheckGlobalTree("dearray", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 6);
 }
diff --git a/src/V3Life.cpp b/src/V3Life.cpp
index db105348c..8e6dc44f6 100644
--- a/src/V3Life.cpp
+++ b/src/V3Life.cpp
@@ -518,7 +518,9 @@ public:
 
 void V3Life::lifeAll(AstNetlist* nodep) {
     UINFO(2,__FUNCTION__<<": "<<endl);
-    LifeState state;
-    LifeTopVisitor visitor (nodep, &state);
+    {
+        LifeState state;
+        LifeTopVisitor visitor (nodep, &state);
+    }  // Destruct before checking
     V3Global::dumpCheckGlobalTree("life", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 3);
 }
diff --git a/src/V3LifePost.cpp b/src/V3LifePost.cpp
index 34042a103..10c69396c 100644
--- a/src/V3LifePost.cpp
+++ b/src/V3LifePost.cpp
@@ -213,6 +213,8 @@ public:
 void V3LifePost::lifepostAll(AstNetlist* nodep) {
     UINFO(2,__FUNCTION__<<": "<<endl);
     // Mark redundant AssignPost
-    LifePostDlyVisitor visitor (nodep);
+    {
+        LifePostDlyVisitor visitor (nodep);
+    }  // Destruct before checking
     V3Global::dumpCheckGlobalTree("life_post", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 3);
 }
diff --git a/src/V3LinkDot.h b/src/V3LinkDot.h
index 5d4dbbb59..3592e79a5 100644
--- a/src/V3LinkDot.h
+++ b/src/V3LinkDot.h
@@ -35,19 +35,23 @@ private:
     static void linkDotGuts(AstNetlist* nodep, VLinkDotStep step);
 public:
     static void linkDotPrimary(AstNetlist* nodep) {
-	UINFO(2,__FUNCTION__<<": "<<endl);	linkDotGuts(nodep,LDS_PRIMARY);
+        UINFO(2,__FUNCTION__<<": "<<endl);
+        linkDotGuts(nodep,LDS_PRIMARY);
 	V3Global::dumpCheckGlobalTree("linkdot", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 6);
     }
     static void linkDotParamed(AstNetlist* nodep) {
-	UINFO(2,__FUNCTION__<<": "<<endl);	linkDotGuts(nodep,LDS_PARAMED);
+        UINFO(2,__FUNCTION__<<": "<<endl);
+        linkDotGuts(nodep,LDS_PARAMED);
 	V3Global::dumpCheckGlobalTree("paramlink", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 3);
     }
     static void linkDotArrayed(AstNetlist* nodep) {
-	UINFO(2,__FUNCTION__<<": "<<endl);	linkDotGuts(nodep,LDS_ARRAYED);
+        UINFO(2,__FUNCTION__<<": "<<endl);
+        linkDotGuts(nodep,LDS_ARRAYED);
 	V3Global::dumpCheckGlobalTree("linkdot", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 6);
     }
     static void linkDotScope(AstNetlist* nodep) {
-	UINFO(2,__FUNCTION__<<": "<<endl);	linkDotGuts(nodep,LDS_SCOPED);
+        UINFO(2,__FUNCTION__<<": "<<endl);
+        linkDotGuts(nodep,LDS_SCOPED);
 	V3Global::dumpCheckGlobalTree("linkdot", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 3);
     }
 };
diff --git a/src/V3LinkJump.cpp b/src/V3LinkJump.cpp
index bbe4ffdc6..38a3c96f9 100644
--- a/src/V3LinkJump.cpp
+++ b/src/V3LinkJump.cpp
@@ -262,6 +262,8 @@ public:
 
 void V3LinkJump::linkJump(AstNetlist* nodep) {
     UINFO(2,__FUNCTION__<<": "<<endl);
-    LinkJumpVisitor bvisitor (nodep);
+    {
+        LinkJumpVisitor bvisitor (nodep);
+    }  // Destruct before checking
     V3Global::dumpCheckGlobalTree("link", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 3);
 }
diff --git a/src/V3LinkLValue.cpp b/src/V3LinkLValue.cpp
index 88839ac7e..63af4f775 100644
--- a/src/V3LinkLValue.cpp
+++ b/src/V3LinkLValue.cpp
@@ -278,7 +278,9 @@ public:
 
 void V3LinkLValue::linkLValue(AstNetlist* rootp) {
     UINFO(4,__FUNCTION__<<": "<<endl);
-    LinkLValueVisitor visitor(rootp, false);
+    {
+        LinkLValueVisitor visitor(rootp, false);
+    }  // Destruct before checking
     V3Global::dumpCheckGlobalTree("linklvalue", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 6);
 }
 void V3LinkLValue::linkLValueSet(AstNode* nodep) {
diff --git a/src/V3LinkParse.cpp b/src/V3LinkParse.cpp
index cd1b7a0cc..05e283fa9 100644
--- a/src/V3LinkParse.cpp
+++ b/src/V3LinkParse.cpp
@@ -430,6 +430,8 @@ public:
 
 void V3LinkParse::linkParse(AstNetlist* rootp) {
     UINFO(4,__FUNCTION__<<": "<<endl);
-    LinkParseVisitor visitor(rootp);
+    {
+        LinkParseVisitor visitor(rootp);
+    }  // Destruct before checking
     V3Global::dumpCheckGlobalTree("linkparse", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 6);
 }
diff --git a/src/V3LinkResolve.cpp b/src/V3LinkResolve.cpp
index 9f9257380..e9b8ad888 100644
--- a/src/V3LinkResolve.cpp
+++ b/src/V3LinkResolve.cpp
@@ -514,7 +514,9 @@ public:
 
 void V3LinkResolve::linkResolve(AstNetlist* rootp) {
     UINFO(4,__FUNCTION__<<": "<<endl);
-    LinkResolveVisitor visitor(rootp);
-    LinkBotupVisitor visitorb(rootp);
+    {
+        LinkResolveVisitor visitor(rootp);
+        LinkBotupVisitor visitorb(rootp);
+    }  // Destruct before checking
     V3Global::dumpCheckGlobalTree("linkresolve", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 6);
 }
diff --git a/src/V3Localize.cpp b/src/V3Localize.cpp
index 6313fbf91..cbdcd5aa1 100644
--- a/src/V3Localize.cpp
+++ b/src/V3Localize.cpp
@@ -248,8 +248,10 @@ public:
 
 void V3Localize::localizeAll(AstNetlist* nodep) {
     UINFO(2,__FUNCTION__<<": "<<endl);
-    LocalizeVisitor visitor (nodep);
-    // Fix up hiernames
-    LocalizeDehierVisitor dvisitor (nodep);
+    {
+        LocalizeVisitor visitor (nodep);
+        // Fix up hiernames
+        LocalizeDehierVisitor dvisitor (nodep);
+    }  // Destruct before checking
     V3Global::dumpCheckGlobalTree("localize", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 6);
 }
diff --git a/src/V3Name.cpp b/src/V3Name.cpp
index bb64ed8ce..9ffb03593 100644
--- a/src/V3Name.cpp
+++ b/src/V3Name.cpp
@@ -148,6 +148,8 @@ public:
 
 void V3Name::nameAll(AstNetlist* nodep) {
     UINFO(2,__FUNCTION__<<": "<<endl);
-    NameVisitor visitor (nodep);
+    {
+        NameVisitor visitor (nodep);
+    }  // Destruct before checking
     V3Global::dumpCheckGlobalTree("name", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 6);
 }
diff --git a/src/V3Order.cpp b/src/V3Order.cpp
index d8be3933e..f395d10ba 100644
--- a/src/V3Order.cpp
+++ b/src/V3Order.cpp
@@ -1645,8 +1645,10 @@ void OrderVisitor::process() {
 
 void V3Order::orderAll(AstNetlist* nodep) {
     UINFO(2,__FUNCTION__<<": "<<endl);
-    OrderClkMarkVisitor markVisitor(nodep);
-    OrderVisitor visitor;
-    visitor.main(nodep);
+    {
+        OrderClkMarkVisitor markVisitor(nodep);
+        OrderVisitor visitor;
+        visitor.main(nodep);
+    }  // Destruct before checking
     V3Global::dumpCheckGlobalTree("order", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 3);
 }
diff --git a/src/V3Param.cpp b/src/V3Param.cpp
index 7b3115a3d..12f27b179 100644
--- a/src/V3Param.cpp
+++ b/src/V3Param.cpp
@@ -782,6 +782,8 @@ void ParamVisitor::visitCell(AstCell* nodep) {
 
 void V3Param::param(AstNetlist* rootp) {
     UINFO(2,__FUNCTION__<<": "<<endl);
-    ParamVisitor visitor (rootp);
+    {
+        ParamVisitor visitor (rootp);
+    }  // Destruct before checking
     V3Global::dumpCheckGlobalTree("param", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 6);
 }
diff --git a/src/V3Premit.cpp b/src/V3Premit.cpp
index 0fa2a154a..c6e1954c4 100644
--- a/src/V3Premit.cpp
+++ b/src/V3Premit.cpp
@@ -427,6 +427,8 @@ public:
 
 void V3Premit::premitAll(AstNetlist* nodep) {
     UINFO(2,__FUNCTION__<<": "<<endl);
-    PremitVisitor visitor (nodep);
+    {
+        PremitVisitor visitor (nodep);
+    }  // Destruct before checking
     V3Global::dumpCheckGlobalTree("premit", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 3);
 }
diff --git a/src/V3Scope.cpp b/src/V3Scope.cpp
index 39148f680..ed6d6553c 100644
--- a/src/V3Scope.cpp
+++ b/src/V3Scope.cpp
@@ -416,7 +416,9 @@ public:
 
 void V3Scope::scopeAll(AstNetlist* nodep) {
     UINFO(2,__FUNCTION__<<": "<<endl);
-    ScopeVisitor visitor (nodep);
-    ScopeCleanupVisitor cleanVisitor (nodep);
+    {
+        ScopeVisitor visitor (nodep);
+        ScopeCleanupVisitor cleanVisitor (nodep);
+    }  // Destruct before checking
     V3Global::dumpCheckGlobalTree("scope", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 3);
 }
diff --git a/src/V3Slice.cpp b/src/V3Slice.cpp
index f070a2e87..b729ef6f5 100644
--- a/src/V3Slice.cpp
+++ b/src/V3Slice.cpp
@@ -239,6 +239,8 @@ public:
 
 void V3Slice::sliceAll(AstNetlist* rootp) {
     UINFO(2,__FUNCTION__<<": "<<endl);
-    SliceVisitor visitor(rootp);
+    {
+        SliceVisitor visitor(rootp);
+    }  // Destruct before checking
     V3Global::dumpCheckGlobalTree("slice", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 3);
 }
diff --git a/src/V3Split.cpp b/src/V3Split.cpp
index 9b07949be..befdda86d 100644
--- a/src/V3Split.cpp
+++ b/src/V3Split.cpp
@@ -578,11 +578,15 @@ public:
 
 void V3Split::splitReorderAll(AstNetlist* nodep) {
     UINFO(2,__FUNCTION__<<": "<<endl);
-    SplitVisitor visitor (nodep, true);
+    {
+        SplitVisitor visitor (nodep, true);
+    }  // Destruct before checking
     V3Global::dumpCheckGlobalTree("reorder", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 3);
 }
 void V3Split::splitAlwaysAll(AstNetlist* nodep) {
     UINFO(2,__FUNCTION__<<": "<<endl);
-    SplitVisitor visitor (nodep, false);
+    {
+        SplitVisitor visitor (nodep, false);
+    }  // Destruct before checking
     V3Global::dumpCheckGlobalTree("split", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 6);
 }
diff --git a/src/V3SplitAs.cpp b/src/V3SplitAs.cpp
index 2178efcb5..9898279ef 100644
--- a/src/V3SplitAs.cpp
+++ b/src/V3SplitAs.cpp
@@ -215,6 +215,8 @@ public:
 
 void V3SplitAs::splitAsAll(AstNetlist* nodep) {
     UINFO(2,__FUNCTION__<<": "<<endl);
-    SplitAsVisitor visitor (nodep);
+    {
+        SplitAsVisitor visitor (nodep);
+    }  // Destruct before checking
     V3Global::dumpCheckGlobalTree("splitas", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 3);
 }
diff --git a/src/V3Subst.cpp b/src/V3Subst.cpp
index 1ce0c22cd..eee575e43 100644
--- a/src/V3Subst.cpp
+++ b/src/V3Subst.cpp
@@ -400,6 +400,8 @@ public:
 
 void V3Subst::substituteAll(AstNetlist* nodep) {
     UINFO(2,__FUNCTION__<<": "<<endl);
-    SubstVisitor visitor (nodep);
+    {
+        SubstVisitor visitor (nodep);
+    }  // Destruct before checking
     V3Global::dumpCheckGlobalTree("subst", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 3);
 }
diff --git a/src/V3Table.cpp b/src/V3Table.cpp
index 484181212..b2e336ab4 100644
--- a/src/V3Table.cpp
+++ b/src/V3Table.cpp
@@ -465,6 +465,8 @@ void TableSimulateVisitor::varRefCb(AstVarRef* nodep) {
 
 void V3Table::tableAll(AstNetlist* nodep) {
     UINFO(2,__FUNCTION__<<": "<<endl);
-    TableVisitor visitor (nodep);
+    {
+        TableVisitor visitor (nodep);
+    }  // Destruct before checking
     V3Global::dumpCheckGlobalTree("table", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 3);
 }
diff --git a/src/V3Task.cpp b/src/V3Task.cpp
index e20505ea9..87c5721de 100644
--- a/src/V3Task.cpp
+++ b/src/V3Task.cpp
@@ -1395,7 +1395,9 @@ V3TaskConnects V3Task::taskConnects(AstNodeFTaskRef* nodep, AstNode* taskStmtsp)
 
 void V3Task::taskAll(AstNetlist* nodep) {
     UINFO(2,__FUNCTION__<<": "<<endl);
-    TaskStateVisitor visitors (nodep);
-    TaskVisitor visitor (nodep, &visitors);
+    {
+        TaskStateVisitor visitors (nodep);
+        TaskVisitor visitor (nodep, &visitors);
+    }  // Destruct before checking
     V3Global::dumpCheckGlobalTree("task", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 3);
 }
diff --git a/src/V3Trace.cpp b/src/V3Trace.cpp
index ae0b76ff4..8bfe2478c 100644
--- a/src/V3Trace.cpp
+++ b/src/V3Trace.cpp
@@ -712,6 +712,8 @@ public:
 
 void V3Trace::traceAll(AstNetlist* nodep) {
     UINFO(2,__FUNCTION__<<": "<<endl);
-    TraceVisitor visitor (nodep);
+    {
+        TraceVisitor visitor (nodep);
+    }  // Destruct before checking
     V3Global::dumpCheckGlobalTree("trace", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 3);
 }
diff --git a/src/V3TraceDecl.cpp b/src/V3TraceDecl.cpp
index 97cc47ffe..dbb65e42a 100644
--- a/src/V3TraceDecl.cpp
+++ b/src/V3TraceDecl.cpp
@@ -325,6 +325,8 @@ public:
 
 void V3TraceDecl::traceDeclAll(AstNetlist* nodep) {
     UINFO(2,__FUNCTION__<<": "<<endl);
-    TraceDeclVisitor visitor (nodep);
+    {
+        TraceDeclVisitor visitor (nodep);
+    }  // Destruct before checking
     V3Global::dumpCheckGlobalTree("tracedecl", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 3);
 }
diff --git a/src/V3Tristate.cpp b/src/V3Tristate.cpp
index 88d36e490..6becb0c60 100644
--- a/src/V3Tristate.cpp
+++ b/src/V3Tristate.cpp
@@ -1341,6 +1341,8 @@ public:
 
 void V3Tristate::tristateAll(AstNetlist* nodep) {
     UINFO(2,__FUNCTION__<<": "<<endl);
-    TristateVisitor visitor (nodep);
+    {
+        TristateVisitor visitor (nodep);
+    }  // Destruct before checking
     V3Global::dumpCheckGlobalTree("tristate", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 3);
 }
diff --git a/src/V3Unknown.cpp b/src/V3Unknown.cpp
index 5dec11be3..98bd8a773 100644
--- a/src/V3Unknown.cpp
+++ b/src/V3Unknown.cpp
@@ -479,6 +479,8 @@ public:
 
 void V3Unknown::unknownAll(AstNetlist* nodep) {
     UINFO(2,__FUNCTION__<<": "<<endl);
-    UnknownVisitor visitor (nodep);
+    {
+        UnknownVisitor visitor (nodep);
+    }  // Destruct before checking
     V3Global::dumpCheckGlobalTree("unknown", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 3);
 }
diff --git a/src/V3Unroll.cpp b/src/V3Unroll.cpp
index b50115e5f..4fb361390 100644
--- a/src/V3Unroll.cpp
+++ b/src/V3Unroll.cpp
@@ -477,7 +477,9 @@ public:
 
 void V3Unroll::unrollAll(AstNetlist* nodep) {
     UINFO(2,__FUNCTION__<<": "<<endl);
-    UnrollVisitor visitor (nodep, false, "");
+    {
+        UnrollVisitor visitor (nodep, false, "");
+    }  // Destruct before checking
     V3Global::dumpCheckGlobalTree("unroll", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 3);
 }
 
diff --git a/src/V3Width.cpp b/src/V3Width.cpp
index f98eef88a..bb6e783cd 100644
--- a/src/V3Width.cpp
+++ b/src/V3Width.cpp
@@ -3862,12 +3862,14 @@ int V3Width::debug() {
 
 void V3Width::width(AstNetlist* nodep) {
     UINFO(2,__FUNCTION__<<": "<<endl);
-    // We should do it in bottom-up module order, but it works in any order.
-    WidthClearVisitor cvisitor (nodep);
-    WidthVisitor visitor (false, false);
-    (void)visitor.mainAcceptEdit(nodep);
-    WidthRemoveVisitor rvisitor;
-    (void)rvisitor.mainAcceptEdit(nodep);
+    {
+        // We should do it in bottom-up module order, but it works in any order.
+        WidthClearVisitor cvisitor (nodep);
+        WidthVisitor visitor (false, false);
+        (void)visitor.mainAcceptEdit(nodep);
+        WidthRemoveVisitor rvisitor;
+        (void)rvisitor.mainAcceptEdit(nodep);
+    }  // Destruct before checking
     V3Global::dumpCheckGlobalTree("width", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 3);
 }
 
@@ -3903,6 +3905,8 @@ AstNode* V3Width::widthGenerateParamsEdit(
 
 void V3Width::widthCommit(AstNetlist* nodep) {
     UINFO(2,__FUNCTION__<<": "<<endl);
-    WidthCommitVisitor visitor (nodep);
+    {
+        WidthCommitVisitor visitor (nodep);
+    }  // Destruct before checking
     V3Global::dumpCheckGlobalTree("widthcommit", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 6);
 }