diff --git a/include/verilated_fst_c.cpp b/include/verilated_fst_c.cpp
index fe77bc01e..ed93bdf64 100644
--- a/include/verilated_fst_c.cpp
+++ b/include/verilated_fst_c.cpp
@@ -191,7 +191,7 @@ void VerilatedFst::declare(uint32_t code, const char* name, int dtypenum, fstVar
         if ((new_it->back() & 0x80)) {
             tmpModName = *new_it;
             tmpModName.pop_back();
-            // If the scope ends with a non-ascii character, it will be 0x80 + fstScopeType
+            // If the scope ends with a non-ASCII character, it will be 0x80 + fstScopeType
             fstWriterSetScope(m_fst, static_cast<fstScopeType>(new_it->back() & 0x7f),
                               tmpModName.c_str(), nullptr);
         } else {
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 77f0f678c..5c85dba24 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -30,270 +30,270 @@ endmacro()
 # Sources and headers for the verilator binary
 
 set(HEADERS
-    V3Active.h                                                                                               
-    V3ActiveTop.h                                                                                            
-    V3Assert.h                                                                                               
-    V3AssertPre.h                                                                                            
-    V3Ast.h                                                                                                  
-    V3AstConstOnly.h                                                                                         
-    V3AstInlines.h                                                                                           
-    V3AstNodeDType.h                                                                                         
-    V3AstNodeExpr.h                                                                                          
-    V3AstNodeOther.h                                                                                         
-    V3AstUserAllocator.h                                                                                     
-    V3Begin.h                                                                                                
-    V3Branch.h                                                                                               
-    V3Broken.h                                                                                               
-    V3Case.h                                                                                                 
-    V3Cast.h                                                                                                 
-    V3CCtors.h                                                                                               
-    V3Cdc.h                                                                                                  
-    V3Class.h                                                                                                
-    V3Clean.h                                                                                                
-    V3Clock.h                                                                                                
-    V3Combine.h                                                                                              
-    V3Common.h                                                                                               
-    V3Config.h                                                                                               
-    V3Const.h                                                                                                
-    V3Coverage.h                                                                                             
-    V3CoverageJoin.h                                                                                         
-    V3CUse.h                                                                                                 
-    V3Dead.h                                                                                                 
-    V3Delayed.h                                                                                              
-    V3Depth.h                                                                                                
-    V3DepthBlock.h                                                                                           
-    V3Descope.h                                                                                              
-    V3Dfg.h                                                                                                  
-    V3DfgOptimizer.h                                                                                         
-    V3DfgPasses.h                                                                                            
-    V3DfgPeephole.h                                                                                          
-    V3DfgVertices.h                                                                                          
-    V3DupFinder.h                                                                                            
-    V3EmitC.h                                                                                                
-    V3EmitCBase.h                                                                                            
-    V3EmitCConstInit.h                                                                                       
-    V3EmitCFunc.h                                                                                            
-    V3EmitCMain.h                                                                                            
-    V3EmitCMake.h                                                                                            
-    V3EmitMk.h                                                                                               
-    V3EmitV.h                                                                                                
-    V3EmitXml.h                                                                                              
-    V3Error.h                                                                                                
-    V3Expand.h                                                                                               
-    V3File.h                                                                                                 
-    V3FileLine.h                                                                                             
-    V3Force.h                                                                                                
-    V3FunctionTraits.h                                                                                       
-    V3Gate.h                                                                                                 
-    V3Global.h                                                                                               
-    V3Graph.h                                                                                                
-    V3GraphAlg.h                                                                                             
-    V3GraphPathChecker.h                                                                                     
-    V3GraphStream.h                                                                                          
-    V3Hash.h                                                                                                 
-    V3Hasher.h                                                                                               
-    V3HierBlock.h                                                                                            
-    V3Inline.h                                                                                               
-    V3Inst.h                                                                                                 
-    V3InstrCount.h                                                                                           
-    V3LangCode.h                                                                                             
-    V3LanguageWords.h                                                                                        
-    V3Life.h                                                                                                 
-    V3LifePost.h                                                                                             
-    V3LinkCells.h                                                                                            
-    V3LinkDot.h                                                                                              
-    V3LinkInc.h                                                                                              
-    V3LinkJump.h                                                                                             
-    V3LinkLevel.h                                                                                            
-    V3LinkLValue.h                                                                                           
-    V3LinkParse.h                                                                                            
-    V3LinkResolve.h                                                                                          
-    V3List.h                                                                                                 
-    V3Localize.h                                                                                             
-    V3MergeCond.h                                                                                            
-    V3Name.h                                                                                                 
-    V3Number.h                                                                                               
-    V3OptionParser.h                                                                                         
-    V3Options.h                                                                                              
-    V3Order.h                                                                                                
-    V3OrderGraph.h                                                                                           
-    V3OrderMoveGraph.h                                                                                       
-    V3Os.h                                                                                                   
-    V3PairingHeap.h                                                                                          
-    V3Param.h                                                                                                
-    V3Parse.h                                                                                                
-    V3ParseImp.h                                                                                             
-    V3ParseSym.h                                                                                             
-    V3Partition.h                                                                                            
-    V3PartitionGraph.h                                                                                       
-    V3PreLex.h                                                                                               
-    V3Premit.h                                                                                               
-    V3PreProc.h                                                                                              
-    V3PreShell.h                                                                                             
-    V3ProtectLib.h                                                                                           
-    V3Randomize.h                                                                                            
-    V3Reloop.h                                                                                               
-    V3Sched.h                                                                                                
-    V3Scope.h                                                                                                
-    V3Scoreboard.h                                                                                           
-    V3SenExprBuilder.h                                                                                       
-    V3SenTree.h                                                                                              
-    V3Simulate.h                                                                                             
-    V3Slice.h                                                                                                
-    V3Split.h                                                                                                
-    V3SplitAs.h                                                                                              
-    V3SplitVar.h                                                                                             
-    V3Stats.h                                                                                                
-    V3StdFuture.h                                                                                            
-    V3String.h                                                                                               
-    V3Subst.h                                                                                                
-    V3SymTable.h                                                                                             
-    V3Table.h                                                                                                
-    V3Task.h                                                                                                 
-    V3Timing.h                                                                                               
-    V3Trace.h                                                                                                
-    V3TraceDecl.h                                                                                            
-    V3Tristate.h                                                                                             
-    V3TSP.h                                                                                                  
-    V3Undriven.h                                                                                             
-    V3UniqueNames.h                                                                                          
-    V3Unknown.h                                                                                              
-    V3Unroll.h                                                                                               
-    V3VariableOrder.h                                                                                        
-    V3Waiver.h                                                                                               
-    V3Width.h                                                                                                
-    V3WidthCommit.h                                                                                          
-    VlcBucket.h                                                                                              
-    VlcOptions.h                                                                                             
-    VlcPoint.h                                                                                               
-    VlcSource.h                                                                                              
-    VlcTest.h                                                                                                
-    VlcTop.h           
+    V3Active.h
+    V3ActiveTop.h
+    V3Assert.h
+    V3AssertPre.h
+    V3Ast.h
+    V3AstConstOnly.h
+    V3AstInlines.h
+    V3AstNodeDType.h
+    V3AstNodeExpr.h
+    V3AstNodeOther.h
+    V3AstUserAllocator.h
+    V3Begin.h
+    V3Branch.h
+    V3Broken.h
+    V3Case.h
+    V3Cast.h
+    V3CCtors.h
+    V3Cdc.h
+    V3Class.h
+    V3Clean.h
+    V3Clock.h
+    V3Combine.h
+    V3Common.h
+    V3Config.h
+    V3Const.h
+    V3Coverage.h
+    V3CoverageJoin.h
+    V3CUse.h
+    V3Dead.h
+    V3Delayed.h
+    V3Depth.h
+    V3DepthBlock.h
+    V3Descope.h
+    V3Dfg.h
+    V3DfgOptimizer.h
+    V3DfgPasses.h
+    V3DfgPeephole.h
+    V3DfgVertices.h
+    V3DupFinder.h
+    V3EmitC.h
+    V3EmitCBase.h
+    V3EmitCConstInit.h
+    V3EmitCFunc.h
+    V3EmitCMain.h
+    V3EmitCMake.h
+    V3EmitMk.h
+    V3EmitV.h
+    V3EmitXml.h
+    V3Error.h
+    V3Expand.h
+    V3File.h
+    V3FileLine.h
+    V3Force.h
+    V3FunctionTraits.h
+    V3Gate.h
+    V3Global.h
+    V3Graph.h
+    V3GraphAlg.h
+    V3GraphPathChecker.h
+    V3GraphStream.h
+    V3Hash.h
+    V3Hasher.h
+    V3HierBlock.h
+    V3Inline.h
+    V3Inst.h
+    V3InstrCount.h
+    V3LangCode.h
+    V3LanguageWords.h
+    V3Life.h
+    V3LifePost.h
+    V3LinkCells.h
+    V3LinkDot.h
+    V3LinkInc.h
+    V3LinkJump.h
+    V3LinkLevel.h
+    V3LinkLValue.h
+    V3LinkParse.h
+    V3LinkResolve.h
+    V3List.h
+    V3Localize.h
+    V3MergeCond.h
+    V3Name.h
+    V3Number.h
+    V3OptionParser.h
+    V3Options.h
+    V3Order.h
+    V3OrderGraph.h
+    V3OrderMoveGraph.h
+    V3Os.h
+    V3PairingHeap.h
+    V3Param.h
+    V3Parse.h
+    V3ParseImp.h
+    V3ParseSym.h
+    V3Partition.h
+    V3PartitionGraph.h
+    V3PreLex.h
+    V3Premit.h
+    V3PreProc.h
+    V3PreShell.h
+    V3ProtectLib.h
+    V3Randomize.h
+    V3Reloop.h
+    V3Sched.h
+    V3Scope.h
+    V3Scoreboard.h
+    V3SenExprBuilder.h
+    V3SenTree.h
+    V3Simulate.h
+    V3Slice.h
+    V3Split.h
+    V3SplitAs.h
+    V3SplitVar.h
+    V3Stats.h
+    V3StdFuture.h
+    V3String.h
+    V3Subst.h
+    V3SymTable.h
+    V3Table.h
+    V3Task.h
+    V3Timing.h
+    V3Trace.h
+    V3TraceDecl.h
+    V3Tristate.h
+    V3TSP.h
+    V3Undriven.h
+    V3UniqueNames.h
+    V3Unknown.h
+    V3Unroll.h
+    V3VariableOrder.h
+    V3Waiver.h
+    V3Width.h
+    V3WidthCommit.h
+    VlcBucket.h
+    VlcOptions.h
+    VlcPoint.h
+    VlcSource.h
+    VlcTest.h
+    VlcTop.h
 )
 
 set(COMMON_SOURCES
-    Verilator.cpp                 
-    V3Active.cpp                  
-    V3ActiveTop.cpp               
-    V3Assert.cpp                  
-    V3AssertPre.cpp               
-    V3Ast.cpp                     
-    V3AstNodes.cpp                
-    V3Begin.cpp                   
-    V3Branch.cpp                  
-    V3Broken.cpp                  
+    Verilator.cpp
+    V3Active.cpp
+    V3ActiveTop.cpp
+    V3Assert.cpp
+    V3AssertPre.cpp
+    V3Ast.cpp
+    V3AstNodes.cpp
+    V3Begin.cpp
+    V3Branch.cpp
+    V3Broken.cpp
     V3CCtors.cpp
     V3CUse.cpp
-    V3Case.cpp                    
-    V3Cast.cpp                    
-    V3Cdc.cpp                     
-    V3Class.cpp                   
-    V3Clean.cpp                   
-    V3Clock.cpp                   
-    V3Combine.cpp                 
-    V3Common.cpp                  
-    V3Config.cpp                  
-    V3Const__gen.cpp                   
-    V3Coverage.cpp                
-    V3CoverageJoin.cpp            
-    V3Dead.cpp                    
-    V3Delayed.cpp                 
-    V3Depth.cpp                   
-    V3DepthBlock.cpp              
-    V3Descope.cpp                 
-    V3Dfg.cpp                     
-    V3DfgAstToDfg.cpp             
-    V3DfgDecomposition.cpp        
-    V3DfgDfgToAst.cpp             
-    V3DfgOptimizer.cpp            
-    V3DfgPasses.cpp               
-    V3DfgPeephole.cpp             
-    V3DupFinder.cpp               
+    V3Case.cpp
+    V3Cast.cpp
+    V3Cdc.cpp
+    V3Class.cpp
+    V3Clean.cpp
+    V3Clock.cpp
+    V3Combine.cpp
+    V3Common.cpp
+    V3Config.cpp
+    V3Const__gen.cpp
+    V3Coverage.cpp
+    V3CoverageJoin.cpp
+    V3Dead.cpp
+    V3Delayed.cpp
+    V3Depth.cpp
+    V3DepthBlock.cpp
+    V3Descope.cpp
+    V3Dfg.cpp
+    V3DfgAstToDfg.cpp
+    V3DfgDecomposition.cpp
+    V3DfgDfgToAst.cpp
+    V3DfgOptimizer.cpp
+    V3DfgPasses.cpp
+    V3DfgPeephole.cpp
+    V3DupFinder.cpp
     V3Timing.cpp
-    V3EmitCBase.cpp               
-    V3EmitCConstPool.cpp          
-    V3EmitCFunc.cpp               
-    V3EmitCHeaders.cpp            
-    V3EmitCImp.cpp                
-    V3EmitCInlines.cpp            
-    V3EmitCMain.cpp               
-    V3EmitCMake.cpp               
-    V3EmitCModel.cpp              
-    V3EmitCSyms.cpp               
-    V3EmitMk.cpp                  
-    V3EmitV.cpp                   
-    V3EmitXml.cpp                 
-    V3Error.cpp                   
-    V3Expand.cpp                  
-    V3File.cpp                    
-    V3FileLine.cpp                
-    V3Force.cpp                   
-    V3Gate.cpp                    
-    V3Global.cpp                  
-    V3Graph.cpp                   
-    V3GraphAcyc.cpp               
-    V3GraphAlg.cpp                
-    V3GraphPathChecker.cpp        
-    V3GraphTest.cpp               
-    V3Hash.cpp                    
-    V3Hasher.cpp                  
-    V3HierBlock.cpp               
-    V3Inline.cpp                  
-    V3Inst.cpp                    
-    V3InstrCount.cpp              
-    V3Life.cpp                    
-    V3LifePost.cpp                
-    V3LinkCells.cpp               
-    V3LinkDot.cpp                 
-    V3LinkInc.cpp                 
-    V3LinkJump.cpp                
-    V3LinkLevel.cpp               
-    V3LinkLValue.cpp              
-    V3LinkParse.cpp               
-    V3LinkResolve.cpp             
-    V3Localize.cpp                
-    V3MergeCond.cpp               
-    V3Name.cpp                    
-    V3Number.cpp                  
-    V3OptionParser.cpp            
-    V3Options.cpp                 
-    V3Order.cpp                   
-    V3Os.cpp                      
-    V3Param.cpp                   
-    V3Partition.cpp               
-    V3PreShell.cpp                
-    V3Premit.cpp                  
-    V3ProtectLib.cpp              
-    V3Randomize.cpp               
-    V3Reloop.cpp                  
-    V3Sched.cpp                   
-    V3SchedAcyclic.cpp            
-    V3SchedPartition.cpp          
-    V3SchedReplicate.cpp          
-    V3SchedTiming.cpp             
-    V3Scope.cpp                   
-    V3Scoreboard.cpp              
-    V3Slice.cpp                   
-    V3Split.cpp                   
-    V3SplitAs.cpp                 
-    V3SplitVar.cpp                
-    V3Stats.cpp                   
-    V3StatsReport.cpp             
-    V3String.cpp                  
-    V3Subst.cpp                   
-    V3Table.cpp                   
-    V3Task.cpp                    
-    V3Trace.cpp                   
-    V3TraceDecl.cpp               
-    V3Tristate.cpp                
-    V3TSP.cpp                     
-    V3Undriven.cpp                
-    V3Unknown.cpp                 
-    V3Unroll.cpp                  
-    V3VariableOrder.cpp           
-    V3Waiver.cpp                  
-    V3Width.cpp                   
-    V3WidthSel.cpp                
+    V3EmitCBase.cpp
+    V3EmitCConstPool.cpp
+    V3EmitCFunc.cpp
+    V3EmitCHeaders.cpp
+    V3EmitCImp.cpp
+    V3EmitCInlines.cpp
+    V3EmitCMain.cpp
+    V3EmitCMake.cpp
+    V3EmitCModel.cpp
+    V3EmitCSyms.cpp
+    V3EmitMk.cpp
+    V3EmitV.cpp
+    V3EmitXml.cpp
+    V3Error.cpp
+    V3Expand.cpp
+    V3File.cpp
+    V3FileLine.cpp
+    V3Force.cpp
+    V3Gate.cpp
+    V3Global.cpp
+    V3Graph.cpp
+    V3GraphAcyc.cpp
+    V3GraphAlg.cpp
+    V3GraphPathChecker.cpp
+    V3GraphTest.cpp
+    V3Hash.cpp
+    V3Hasher.cpp
+    V3HierBlock.cpp
+    V3Inline.cpp
+    V3Inst.cpp
+    V3InstrCount.cpp
+    V3Life.cpp
+    V3LifePost.cpp
+    V3LinkCells.cpp
+    V3LinkDot.cpp
+    V3LinkInc.cpp
+    V3LinkJump.cpp
+    V3LinkLevel.cpp
+    V3LinkLValue.cpp
+    V3LinkParse.cpp
+    V3LinkResolve.cpp
+    V3Localize.cpp
+    V3MergeCond.cpp
+    V3Name.cpp
+    V3Number.cpp
+    V3OptionParser.cpp
+    V3Options.cpp
+    V3Order.cpp
+    V3Os.cpp
+    V3Param.cpp
+    V3Partition.cpp
+    V3PreShell.cpp
+    V3Premit.cpp
+    V3ProtectLib.cpp
+    V3Randomize.cpp
+    V3Reloop.cpp
+    V3Sched.cpp
+    V3SchedAcyclic.cpp
+    V3SchedPartition.cpp
+    V3SchedReplicate.cpp
+    V3SchedTiming.cpp
+    V3Scope.cpp
+    V3Scoreboard.cpp
+    V3Slice.cpp
+    V3Split.cpp
+    V3SplitAs.cpp
+    V3SplitVar.cpp
+    V3Stats.cpp
+    V3StatsReport.cpp
+    V3String.cpp
+    V3Subst.cpp
+    V3Table.cpp
+    V3Task.cpp
+    V3Trace.cpp
+    V3TraceDecl.cpp
+    V3Tristate.cpp
+    V3TSP.cpp
+    V3Undriven.cpp
+    V3Unknown.cpp
+    V3Unroll.cpp
+    V3VariableOrder.cpp
+    V3Waiver.cpp
+    V3Width.cpp
+    V3WidthSel.cpp
     V3ParseImp.cpp
     V3ParseGrammar.cpp
     V3ParseLex.cpp
diff --git a/test_regress/t/t_dist_whitespace.pl b/test_regress/t/t_dist_whitespace.pl
index 1d8825d6c..3a09d63e7 100755
--- a/test_regress/t/t_dist_whitespace.pl
+++ b/test_regress/t/t_dist_whitespace.pl
@@ -33,7 +33,7 @@ foreach my $file (sort keys %files) {
     }
     if ($contents =~ /[ \t]\n/
         || $contents =~ m/\n\n+$/) {  # Regexp repeated below
-        my $eol_ws_exempt = ($file =~ /(\.txt|\.html)$/
+        my $eol_ws_exempt = ($file =~ /spelling.txt$/
                              || $file =~ m!/gtkwave/!);
         next if $eol_ws_exempt;
         if ($ENV{HARNESS_UPDATE_GOLDEN}) {
@@ -49,7 +49,7 @@ foreach my $file (sort keys %files) {
         my $line_no = 0;
         foreach my $line (@lines) {
             $line_no++;
-            # Trim trailing carriage-return (ascii 0xd) and form feed (0xc),
+            # Trim trailing carriage-return (ASCII 0x0d) and form feed (0x0c),
             # as we expect a few of those
             $line =~ s/[\x{d}\x{c}]//g;
             if ($line =~ /\s$/) {
diff --git a/test_regress/t/t_hier_block_cmake/CMakeLists.txt b/test_regress/t/t_hier_block_cmake/CMakeLists.txt
index 6e7c91bbe..645be0795 100644
--- a/test_regress/t/t_hier_block_cmake/CMakeLists.txt
+++ b/test_regress/t/t_hier_block_cmake/CMakeLists.txt
@@ -24,4 +24,3 @@ set(VERILATOR_OPTIONS "${VERILATOR_OPTIONS}" --hierarchical --stats --CFLAGS "-p
 
 verilate(t_hier_block_cmake VERILATOR_ARGS ${VERILATOR_OPTIONS} SOURCES
     ../t_hier_block.v )
-