diff --git a/verible/common/formatting/token-partition-tree.cc b/verible/common/formatting/token-partition-tree.cc
index 6f3c556..2d63430 100644
--- a/verible/common/formatting/token-partition-tree.cc
+++ b/verible/common/formatting/token-partition-tree.cc
@@ -805,8 +805,7 @@
     // Merge extra header leaves only when a nested argument list still
     // follows.  All-leaf trees are the flattened one-argument form
     // ([header, arg] or [header, arg, trailer]) and must be left intact.
-    if (is_leaf(first) && is_leaf(second) &&
-        CountNonLeafChildren(*node) >= 1) {
+    if (is_leaf(first) && is_leaf(second) && CountNonLeafChildren(*node) >= 1) {
       MergeConsecutiveSiblings(node, 0);
       continue;
     }
diff --git a/verible/verilog/formatting/formatter_test.cc b/verible/verilog/formatting/formatter_test.cc
index 07dd4bb..49e8fe8 100644
--- a/verible/verilog/formatting/formatter_test.cc
+++ b/verible/verilog/formatting/formatter_test.cc
@@ -20966,13 +20966,15 @@
   static constexpr FormatterTestCase kTestCases[] = {
       {// Original issue sample (default column_limit 100)
        "package foo;\n"
-       "  function some_large_return_type [$clog2(some_large_contant_name)-1:0] "
+       "  function some_large_return_type "
+       "[$clog2(some_large_contant_name)-1:0] "
        "f_some_long_function( input int parameter_1, input int parameter_2);\n"
        "    return 1;\n"
        "  endfunction\n"
        "endpackage\n",
        "package foo;\n"
-       "  function some_large_return_type [$clog2(some_large_contant_name)-1:0] "
+       "  function some_large_return_type "
+       "[$clog2(some_large_contant_name)-1:0] "
        "f_some_long_function(\n"
        "      input int parameter_1, input int parameter_2);\n"
        "    return 1;\n"
@@ -21048,7 +21050,8 @@
   // The header itself is longer than 40 columns, so it wraps.
   static constexpr FormatterTestCase kTestCases[] = {
       {"package foo;\n"
-       "  function some_large_return_type [$clog2(some_large_contant_name)-1:0] "
+       "  function some_large_return_type "
+       "[$clog2(some_large_contant_name)-1:0] "
        "f_some_long_function( input int parameter_1, input int parameter_2);\n"
        "    return 1;\n"
        "  endfunction\n"