diff --git a/include/verilated_fst_c.cpp b/include/verilated_fst_c.cpp
index 79b209c2e..1120e0529 100644
--- a/include/verilated_fst_c.cpp
+++ b/include/verilated_fst_c.cpp
@@ -53,21 +53,30 @@
 
 //=============================================================================
 // Check that vltscope_t matches fstScopeType
-static_assert((int)FST_ST_VCD_MODULE == (int)VLT_TRACE_SCOPE_MODULE, "VLT_TRACE_SCOPE_MODULE mismatches");
-static_assert((int)FST_ST_VCD_TASK == (int)VLT_TRACE_SCOPE_TASK, "VLT_TRACE_SCOPE_TASK mismatches");
+static_assert((int)FST_ST_VCD_MODULE == (int)VLT_TRACE_SCOPE_MODULE,
+              "VLT_TRACE_SCOPE_MODULE mismatches");
+static_assert((int)FST_ST_VCD_TASK == (int)VLT_TRACE_SCOPE_TASK,
+              "VLT_TRACE_SCOPE_TASK mismatches");
 static_assert((int)FST_ST_VCD_FUNCTION == (int)VLT_TRACE_SCOPE_FUNCTION,
               "VLT_TRACE_SCOPE_FUNCTION mismatches");
-static_assert((int)FST_ST_VCD_BEGIN == (int)VLT_TRACE_SCOPE_BEGIN, "VLT_TRACE_SCOPE_BEGIN mismatches");
-static_assert((int)FST_ST_VCD_FORK == (int)VLT_TRACE_SCOPE_FORK, "VLT_TRACE_SCOPE_FORK mismatches");
+static_assert((int)FST_ST_VCD_BEGIN == (int)VLT_TRACE_SCOPE_BEGIN,
+              "VLT_TRACE_SCOPE_BEGIN mismatches");
+static_assert((int)FST_ST_VCD_FORK == (int)VLT_TRACE_SCOPE_FORK,
+              "VLT_TRACE_SCOPE_FORK mismatches");
 static_assert((int)FST_ST_VCD_GENERATE == (int)VLT_TRACE_SCOPE_GENERATE,
               "VLT_TRACE_SCOPE_GENERATE mismatches");
-static_assert((int)FST_ST_VCD_STRUCT == (int)VLT_TRACE_SCOPE_STRUCT, "VLT_TRACE_SCOPE_STRUCT mismatches");
-static_assert((int)FST_ST_VCD_UNION == (int)VLT_TRACE_SCOPE_UNION, "VLT_TRACE_SCOPE_UNION mismatches");
-static_assert((int)FST_ST_VCD_CLASS == (int)VLT_TRACE_SCOPE_CLASS, "VLT_TRACE_SCOPE_CLASS mismatches");
+static_assert((int)FST_ST_VCD_STRUCT == (int)VLT_TRACE_SCOPE_STRUCT,
+              "VLT_TRACE_SCOPE_STRUCT mismatches");
+static_assert((int)FST_ST_VCD_UNION == (int)VLT_TRACE_SCOPE_UNION,
+              "VLT_TRACE_SCOPE_UNION mismatches");
+static_assert((int)FST_ST_VCD_CLASS == (int)VLT_TRACE_SCOPE_CLASS,
+              "VLT_TRACE_SCOPE_CLASS mismatches");
 static_assert((int)FST_ST_VCD_INTERFACE == (int)VLT_TRACE_SCOPE_INTERFACE,
               "VLT_TRACE_SCOPE_INTERFACE mismatches");
-static_assert((int)FST_ST_VCD_PACKAGE == (int)VLT_TRACE_SCOPE_PACKAGE, "VLT_TRACE_SCOPE_PACKAGE mismatches");
-static_assert((int)FST_ST_VCD_PROGRAM == (int)VLT_TRACE_SCOPE_PROGRAM, "VLT_TRACE_SCOPE_PROGRAM mismatches");
+static_assert((int)FST_ST_VCD_PACKAGE == (int)VLT_TRACE_SCOPE_PACKAGE,
+              "VLT_TRACE_SCOPE_PACKAGE mismatches");
+static_assert((int)FST_ST_VCD_PROGRAM == (int)VLT_TRACE_SCOPE_PROGRAM,
+              "VLT_TRACE_SCOPE_PROGRAM mismatches");
 
 //=============================================================================
 // Specialization of the generics for this trace format
diff --git a/src/V3TraceDecl.cpp b/src/V3TraceDecl.cpp
index 248fffec4..ac7f9a7f0 100644
--- a/src/V3TraceDecl.cpp
+++ b/src/V3TraceDecl.cpp
@@ -306,8 +306,8 @@ private:
                         if (VN_IS(nodep, StructDType)) {
                             // Mark scope as a struct by setting the last char to 0x80 + the
                             // fstScopeType
-                            m_traShowname
-                                += getScopeChar(VLT_TRACE_SCOPE_STRUCT) + " " + itemp->prettyName();
+                            m_traShowname += getScopeChar(VLT_TRACE_SCOPE_STRUCT) + " "
+                                             + itemp->prettyName();
 
                             m_traValuep
                                 = new AstSel(nodep->fileline(), m_traValuep->cloneTree(true),