diff --git a/src/V3File.cpp b/src/V3File.cpp
index ea2c89d81..61dad9b82 100644
--- a/src/V3File.cpp
+++ b/src/V3File.cpp
@@ -147,8 +147,6 @@ inline void V3FileDependImp::writeDepend(const string& filename) {
     *ofp<<" : ";
     *ofp<<v3Global.opt.bin();
     *ofp<<" ";
-    *ofp<<V3PreShell::dependFiles();
-    *ofp<<"  ";
 
     for (std::set<DependFile>::iterator iter=m_filenameList.begin();
          iter!=m_filenameList.end(); ++iter) {
@@ -532,7 +530,7 @@ protected:
         if (listSize(outl) < INFILTER_CACHE_MAX) {
             // Cache small files (only to save space)
             // It's quite common to `include "timescale" thousands of times
-            // This isn't so important if it's just a open(), but filtering can be slow
+            // This isn't so important if it's just an open(), but filtering can be slow
             m_contentsMap.insert(make_pair(filename, listString(outl)));
         }
         return true;
diff --git a/src/V3LinkDot.cpp b/src/V3LinkDot.cpp
index ae14a28bc..6d75fce16 100644
--- a/src/V3LinkDot.cpp
+++ b/src/V3LinkDot.cpp
@@ -1275,7 +1275,7 @@ private:
     }
     virtual void visit(AstDefParam* nodep) {
         iterateChildren(nodep);
-        nodep->v3warn(DEFPARAM, "Suggest replace defparam with Verilog 2001 #(."
+        nodep->v3warn(DEFPARAM, "Suggest replace defparam assignment with Verilog 2001 #(."
                       <<nodep->prettyName()<<"(...etc...))");
         VSymEnt* foundp = m_statep->getNodeSym(nodep)->findIdFallback(nodep->path());
         AstCell* cellp = foundp ? VN_CAST(foundp->nodep(), Cell) : NULL;
@@ -1755,7 +1755,7 @@ private:
                            <<nodep->warnContextPrimary()<<endl
                            <<refp->user5p()->warnOther()
                            <<"... Location of original "<<whatp<<" connection\n"
-                           <<nodep->warnContextSecondary());
+                           <<refp->user5p()->warnContextSecondary());
         } else {
             refp->user5p(nodep);
         }
diff --git a/src/V3Options.cpp b/src/V3Options.cpp
index 73d883ee0..0aea814c6 100644
--- a/src/V3Options.cpp
+++ b/src/V3Options.cpp
@@ -669,7 +669,7 @@ void V3Options::parseOptsList(FileLine* fl, const string& optdir, int argc, char
             else if ( onoff (sw, "-covsp", flag/*ref*/))        { }  // TBD
             else if (!strcmp(sw, "-debug-abort")) { abort(); }  // Undocumented, see also --debug-sigsegv
             else if ( onoff (sw, "-debug-check", flag/*ref*/))  { m_debugCheck = flag; }
-            else if ( onoff   (sw, "-debug-collision", flag/*ref*/) ){ m_debugCollision = flag; }  // Undocumented
+            else if ( onoff (sw, "-debug-collision", flag/*ref*/)) { m_debugCollision = flag; }  // Undocumented
             else if ( onoff (sw, "-debug-leak", flag/*ref*/))   { m_debugLeak = flag; }
             else if ( onoff (sw, "-debug-nondeterminism", flag/*ref*/)){ m_debugNondeterminism = flag; }
             else if ( onoff (sw, "-debug-partition", flag/*ref*/)){ m_debugPartition = flag; }  // Undocumented
diff --git a/src/V3PreLex.l b/src/V3PreLex.l
index 103ca7753..fe7013e7f 100644
--- a/src/V3PreLex.l
+++ b/src/V3PreLex.l
@@ -479,7 +479,7 @@ void V3PreLex::scanSwitchStream(VPreStream* streamp) {
 void V3PreLex::scanBytesBack(const string& str) {
     // Initial creation, that will pull from YY_INPUT==inputToLex
     // Note buffers also appended in ::scanBytes
-    if (curStreamp()->m_eof) yyerrorf("scanBytesBack without being under scanNewFile");
+    if (VL_UNCOVERABLE(curStreamp()->m_eof)) yyerrorf("scanBytesBack not under scanNewFile");
     curStreamp()->m_buffers.push_back(str);
 }
 
diff --git a/src/V3PreProc.cpp b/src/V3PreProc.cpp
index 751e0f35b..863ac9016 100644
--- a/src/V3PreProc.cpp
+++ b/src/V3PreProc.cpp
@@ -1489,7 +1489,6 @@ int V3PreProcImp::getFinalToken(string& buf) {
         for (string::iterator cp=buf.begin(); cp!=buf.end(); ++cp) {
             if (*cp == '\n') {
                 m_finAtBol = true;
-                // Increment in place to avoid new/delete calls.  It's private data.
                 m_finFilelinep->linenoInc();
             } else {
                 m_finAtBol = false;
diff --git a/src/V3PreShell.cpp b/src/V3PreShell.cpp
index 5a08ace0f..366c1a44a 100644
--- a/src/V3PreShell.cpp
+++ b/src/V3PreShell.cpp
@@ -110,7 +110,7 @@ protected:
             // Leting lex parse this saves us from having to specially en/decode
             // from the V3LangCode to the various Lex BEGIN states. The language
             // of this source file is updated here, in case there have been any
-            // intervening +<lang>ext+ options since it was first ecountered.
+            // intervening +<lang>ext+ options since it was first encountered.
             FileLine* modfileline = new FileLine(modfilename);
             modfileline->language(v3Global.opt.fileLanguage(modfilename));
             V3Parse::ppPushText(parsep, (string("`begin_keywords \"")
diff --git a/src/V3PreShell.h b/src/V3PreShell.h
index 91f56132c..810feaff9 100644
--- a/src/V3PreShell.h
+++ b/src/V3PreShell.h
@@ -40,7 +40,6 @@ public:
     static bool preproc(FileLine* fl, const string& modname, V3InFilter* filterp,
                         V3ParseImp* parsep, const string& errmsg);
     static void preprocInclude(FileLine* fl, const string& modname);
-    static string dependFiles() { return ""; }  // Perl only
     static void defineCmdLine(const string& name, const string& value);
     static void undef(const string& name);
     static void dumpDefines(std::ostream& os);
diff --git a/test_regress/t/t_lint_defparam_bad.out b/test_regress/t/t_lint_defparam_bad.out
index b88488f76..88fa7c7f0 100644
--- a/test_regress/t/t_lint_defparam_bad.out
+++ b/test_regress/t/t_lint_defparam_bad.out
@@ -1,3 +1,3 @@
-%Warning-DEFPARAM: t/t_lint_defparam.v:9: Suggest replace defparam with Verilog 2001 #(.P(...etc...))
+%Warning-DEFPARAM: t/t_lint_defparam.v:9: Suggest replace defparam assignment with Verilog 2001 #(.P(...etc...))
                    ... Use "/* verilator lint_off DEFPARAM */" and lint_on around source to disable this message.
 %Error: Exiting due to