diff --git a/MANIFEST.SKIP b/MANIFEST.SKIP
index c0d696663..97f2a9fa3 100644
--- a/MANIFEST.SKIP
+++ b/MANIFEST.SKIP
@@ -28,7 +28,7 @@
 /obj_vcs/
 /obj_vlt/
 /obj_vltmt/
-/INCA_libs/
+INCA_libs/
 /cov_work/
 /logs/
 ^Makefile$
@@ -37,6 +37,7 @@ bin/verilator_bin.*
 bin/verilator_coverage_bin.*
 docs/.*\.html$
 docs/Makefile$
+docs/clang-format.txt$
 docs/doxygen-doc/.*
 examples/xml_py/copied/
 examples/xml_py/graph.*
diff --git a/include/verilated.h b/include/verilated.h
index 7381e67b1..fdd921ea7 100644
--- a/include/verilated.h
+++ b/include/verilated.h
@@ -2252,7 +2252,7 @@ static inline QData VL_RTOIROUND_Q_D(int bits, double lhs) VL_PURE {
     // IEEE format: [63]=sign [62:52]=exp+1023 [51:0]=mantissa
     // This does not need to support subnormals as they are sub-integral
     lhs = VL_ROUND(lhs);
-    if (!lhs) return 0;
+    if (lhs == 0.0) return 0;
     QData q = VL_CVT_Q_D(lhs);
     int lsb = static_cast<int>((q >> VL_ULL(52)) & VL_MASK_Q(11)) - 1023 - 52;
     vluint64_t mantissa = (q & VL_MASK_Q(52)) | (VL_ULL(1) << 52);
@@ -2273,7 +2273,7 @@ static inline WDataOutP VL_RTOIROUND_W_D(int obits, WDataOutP owp, double lhs) V
     // This does not need to support subnormals as they are sub-integral
     lhs = VL_ROUND(lhs);
     VL_ZERO_W(obits, owp);
-    if (!lhs) return owp;
+    if (lhs == 0.0) return owp;
     QData q = VL_CVT_Q_D(lhs);
     int lsb = static_cast<int>((q >> VL_ULL(52)) & VL_MASK_Q(11)) - 1023 - 52;
     vluint64_t mantissa = (q & VL_MASK_Q(52)) | (VL_ULL(1) << 52);
diff --git a/src/VlcMain.cpp b/src/VlcMain.cpp
index 6670f7826..601bea6cd 100644
--- a/src/VlcMain.cpp
+++ b/src/VlcMain.cpp
@@ -68,7 +68,8 @@ void VlcOptions::parseOptsList(int argc, char** argv) {
     // Parse parameters
     // Note argc and argv DO NOT INCLUDE the filename in [0]!!!
     // May be called recursively when there are -f files.
-#define shift { ++i; }
+#define shift \
+    { ++i; }
     for (int i = 0; i < argc;) {
         UINFO(9, " Option: " << argv[i] << endl);
         if (argv[i][0] == '-') {
@@ -77,7 +78,7 @@ void VlcOptions::parseOptsList(int argc, char** argv) {
             // Allow gnu -- switches
             if (sw[0] == '-' && sw[1] == '-') ++sw;
             // Single switches
-            else if (onoff(sw, "-annotate-all", flag /*ref*/)) {
+            if (onoff(sw, "-annotate-all", flag /*ref*/)) {
                 m_annotateAll = flag;
             } else if (onoff(sw, "-rank", flag /*ref*/)) {
                 m_rank = flag;