diff --git a/core/src/main/java/com/google/googlejavaformat/java/JavaInputAstVisitor.java b/core/src/main/java/com/google/googlejavaformat/java/JavaInputAstVisitor.java
index 1f51a7632..1123ac01c 100644
--- a/core/src/main/java/com/google/googlejavaformat/java/JavaInputAstVisitor.java
+++ b/core/src/main/java/com/google/googlejavaformat/java/JavaInputAstVisitor.java
@@ -368,16 +368,16 @@ public Void scan(Tree tree, Void unused) {
 
   @Override
   public Void visitCompilationUnit(CompilationUnitTree node, Void unused) {
-    boolean first = true;
+    boolean afterFirstToken = false;
     if (node.getPackageName() != null) {
       markForPartialFormat();
       visitPackage(node.getPackageName(), node.getPackageAnnotations());
       builder.forcedBreak();
-      first = false;
+      afterFirstToken = true;
     }
     dropEmptyDeclarations();
     if (!node.getImports().isEmpty()) {
-      if (!first) {
+      if (afterFirstToken) {
         builder.blankLineWanted(BlankLineWanted.YES);
       }
       for (ImportTree importDeclaration : node.getImports()) {
@@ -386,7 +386,7 @@ public Void visitCompilationUnit(CompilationUnitTree node, Void unused) {
         scan(importDeclaration, null);
         builder.forcedBreak();
       }
-      first = false;
+      afterFirstToken = true;
     }
     dropEmptyDeclarations();
     for (Tree type : node.getTypeDecls()) {
@@ -395,22 +395,22 @@ public Void visitCompilationUnit(CompilationUnitTree node, Void unused) {
         // TODO(cushon): remove this if https://bugs.openjdk.java.net/browse/JDK-8027682 is fixed
         continue;
       }
-      if (!first) {
+      if (afterFirstToken) {
         builder.blankLineWanted(BlankLineWanted.YES);
       }
       markForPartialFormat();
       scan(type, null);
       builder.forcedBreak();
-      first = false;
+      afterFirstToken = true;
       dropEmptyDeclarations();
     }
-    handleModule(first, node);
+    handleModule(afterFirstToken, node);
     // set a partial format marker at EOF to make sure we can format the entire file
     markForPartialFormat();
     return null;
   }
 
-  protected void handleModule(boolean first, CompilationUnitTree node) {}
+  protected void handleModule(boolean afterFirstToken, CompilationUnitTree node) {}
 
   /** Skips over extra semi-colons at the top-level, or in a class member declaration lists. */
   protected void dropEmptyDeclarations() {
@@ -514,9 +514,9 @@ public boolean visitArrayInitializer(List<? extends ExpressionTree> expressions)
       builder.open(plusTwo);
       token("{");
       builder.forcedBreak();
-      boolean first = true;
+      boolean afterFirstToken = false;
       for (Iterable<? extends ExpressionTree> row : Iterables.partition(expressions, cols)) {
-        if (!first) {
+        if (afterFirstToken) {
           builder.forcedBreak();
         }
         builder.open(row.iterator().next().getKind() == NEW_ARRAY || cols == 1 ? ZERO : plusFour);
@@ -531,7 +531,7 @@ public boolean visitArrayInitializer(List<? extends ExpressionTree> expressions)
         }
         builder.guessToken(",");
         builder.close();
-        first = false;
+        afterFirstToken = true;
       }
       builder.breakOp(minusTwo);
       builder.close();
@@ -562,15 +562,15 @@ public boolean visitArrayInitializer(List<? extends ExpressionTree> expressions)
       if (allowFilledElementsOnOwnLine) {
         builder.open(ZERO);
       }
-      boolean first = true;
+      boolean afterFirstToken = false;
       FillMode fillMode = shortItems ? FillMode.INDEPENDENT : FillMode.UNIFIED;
       for (ExpressionTree expression : expressions) {
-        if (!first) {
+        if (afterFirstToken) {
           token(",");
           builder.breakOp(fillMode, " ", ZERO);
         }
         scan(expression, null);
-        first = false;
+        afterFirstToken = true;
       }
       builder.guessToken(",");
       if (allowFilledElementsOnOwnLine) {
@@ -842,14 +842,14 @@ public boolean visitEnumDeclaration(ClassTree node) {
       token("implements");
       builder.breakOp(" ");
       builder.open(ZERO);
-      boolean first = true;
+      boolean afterFirstToken = false;
       for (Tree superInterfaceType : node.getImplementsClause()) {
-        if (!first) {
+        if (afterFirstToken) {
           token(",");
           builder.breakToFill(" ");
         }
         scan(superInterfaceType, null);
-        first = false;
+        afterFirstToken = true;
       }
       builder.close();
       builder.close();
@@ -893,16 +893,16 @@ public boolean visitEnumDeclaration(ClassTree node) {
       builder.blankLineWanted(BlankLineWanted.NO);
       builder.forcedBreak();
       builder.open(ZERO);
-      boolean first = true;
+      boolean afterFirstToken = false;
       for (VariableTree enumConstant : enumConstants) {
-        if (!first) {
+        if (afterFirstToken) {
           token(",");
           builder.forcedBreak();
           builder.blankLineWanted(BlankLineWanted.PRESERVE);
         }
         markForPartialFormat();
         visitEnumConstantDeclaration(enumConstant);
-        first = false;
+        afterFirstToken = true;
       }
       if (builder.peekToken().orElse("").equals(",")) {
         token(",");
@@ -984,18 +984,19 @@ void visitVariables(
           Optional.ofNullable(fragment.getInitializer()),
           Optional.of(";"),
           /* receiverExpression= */ Optional.empty(),
-          Optional.ofNullable(variableFragmentDims(true, 0, fragment.getType())));
+          Optional.ofNullable(variableFragmentDims(false, 0, fragment.getType())));
 
     } else {
       declareMany(fragments, annotationDirection);
     }
   }
 
-  private static TypeWithDims variableFragmentDims(boolean first, int leadingDims, Tree type) {
+  private static TypeWithDims variableFragmentDims(
+      boolean afterFirstToken, int leadingDims, Tree type) {
     if (type == null) {
       return null;
     }
-    if (first) {
+    if (!afterFirstToken) {
       return DimensionHelpers.extractDims(type, SortedDims.YES);
     }
     TypeWithDims dims = DimensionHelpers.extractDims(type, SortedDims.NO);
@@ -1022,15 +1023,15 @@ public Void visitForLoop(ForLoopTree node, Void unused) {
         visitVariables(
             variableFragments(it, it.next()), DeclarationKind.NONE, Direction.HORIZONTAL);
       } else {
-        boolean first = true;
+        boolean afterFirstToken = false;
         builder.open(ZERO);
         for (StatementTree t : node.getInitializer()) {
-          if (!first) {
+          if (afterFirstToken) {
             token(",");
             builder.breakOp(" ");
           }
           scan(((ExpressionStatementTree) t).getExpression(), null);
-          first = false;
+          afterFirstToken = true;
         }
         token(";");
         builder.close();
@@ -1087,11 +1088,11 @@ public Void visitIf(IfTree node, Void unused) {
       }
     }
     builder.open(ZERO);
-    boolean first = true;
+    boolean afterFirstToken = false;
     boolean followingBlock = false;
     int expressionsN = expressions.size();
     for (int i = 0; i < expressionsN; i++) {
-      if (!first) {
+      if (afterFirstToken) {
         if (followingBlock) {
           builder.space();
         } else {
@@ -1115,7 +1116,7 @@ public Void visitIf(IfTree node, Void unused) {
           AllowLeadingBlankLine.YES,
           AllowTrailingBlankLine.valueOf(trailingClauses));
       followingBlock = statements.get(i).getKind() == BLOCK;
-      first = false;
+      afterFirstToken = true;
     }
     if (node.getElseStatement() != null) {
       if (followingBlock) {
@@ -1208,15 +1209,15 @@ public Void visitInstanceOf(InstanceOfTree node, Void unused) {
   public Void visitIntersectionType(IntersectionTypeTree node, Void unused) {
     sync(node);
     builder.open(plusFour);
-    boolean first = true;
+    boolean afterFirstToken = false;
     for (Tree type : node.getBounds()) {
-      if (!first) {
+      if (afterFirstToken) {
         builder.breakToFill(" ");
         token("&");
         builder.space();
       }
       scan(type, null);
-      first = false;
+      afterFirstToken = true;
     }
     builder.close();
     return null;
@@ -1243,9 +1244,9 @@ public Void visitLambdaExpression(LambdaExpressionTree node, Void unused) {
     if (parens) {
       token("(");
     }
-    boolean first = true;
+    boolean afterFirstToken = false;
     for (VariableTree parameter : node.getParameters()) {
-      if (!first) {
+      if (afterFirstToken) {
         token(",");
         builder.breakOp(" ");
       }
@@ -1253,7 +1254,7 @@ public Void visitLambdaExpression(LambdaExpressionTree node, Void unused) {
           ImmutableList.of(parameter),
           DeclarationKind.NONE,
           fieldAnnotationDirection(parameter.getModifiers()));
-      first = false;
+      afterFirstToken = true;
     }
     if (parens) {
       token(")");
@@ -1295,14 +1296,14 @@ public Void visitAnnotation(AnnotationTree node, Void unused) {
       builder.open(plusFour);
       token("(");
       builder.breakOp();
-      boolean first = true;
+      boolean afterFirstToken = false;
 
       // Format the member value pairs one-per-line if any of them are
       // initialized with arrays.
       boolean hasArrayInitializer =
           Iterables.any(node.getArguments(), JavaInputAstVisitor::isArrayValue);
       for (ExpressionTree argument : node.getArguments()) {
-        if (!first) {
+        if (afterFirstToken) {
           token(",");
           if (hasArrayInitializer) {
             builder.forcedBreak();
@@ -1315,7 +1316,7 @@ public Void visitAnnotation(AnnotationTree node, Void unused) {
         } else {
           scan(argument, null);
         }
-        first = false;
+        afterFirstToken = true;
       }
       token(")");
       builder.close();
@@ -1433,28 +1434,28 @@ public Void visitMethod(MethodTree node, Void unused) {
     BreakTag breakBeforeType = genSym();
     builder.open(ZERO);
     {
-      boolean first = true;
+      boolean afterFirstToken = false;
       if (!typeAnnotations.isEmpty()) {
         visitAnnotations(typeAnnotations, BreakOrNot.NO, BreakOrNot.NO);
-        first = false;
+        afterFirstToken = true;
       }
       if (!node.getTypeParameters().isEmpty()) {
-        if (!first) {
+        if (afterFirstToken) {
           builder.breakToFill(" ");
         }
         token("<");
         typeParametersRest(node.getTypeParameters(), plusFour);
-        first = false;
+        afterFirstToken = true;
       }
 
       boolean openedNameAndTypeScope = false;
       // constructor-like declarations that don't match the name of the enclosing class are
       // parsed as method declarations with a null return type
       if (baseReturnType != null) {
-        if (!first) {
+        if (afterFirstToken) {
           builder.breakOp(INDEPENDENT, " ", ZERO, Optional.of(breakBeforeType));
         } else {
-          first = false;
+          afterFirstToken = true;
         }
         if (!openedNameAndTypeScope) {
           builder.open(make(breakBeforeType, plusFour, ZERO));
@@ -1469,10 +1470,10 @@ public Void visitMethod(MethodTree node, Void unused) {
         maybeAddDims(dims);
         builder.close();
       }
-      if (!first) {
+      if (afterFirstToken) {
         builder.breakOp(Doc.FillMode.INDEPENDENT, " ", ZERO, Optional.of(breakBeforeName));
       } else {
-        first = false;
+        afterFirstToken = true;
       }
       if (!openedNameAndTypeScope) {
         builder.open(ZERO);
@@ -1712,14 +1713,14 @@ public Void visitParameterizedType(ParameterizedTypeTree node, Void unused) {
       token("<");
       builder.breakOp();
       builder.open(ZERO);
-      boolean first = true;
+      boolean afterFirstToken = false;
       for (Tree typeArgument : node.getTypeArguments()) {
-        if (!first) {
+        if (afterFirstToken) {
           token(",");
           builder.breakOp(" ");
         }
         scan(typeArgument, null);
-        first = false;
+        afterFirstToken = true;
       }
       builder.close();
       builder.close();
@@ -1905,13 +1906,13 @@ protected void visitSwitch(ExpressionTree expression, List<? extends CaseTree> c
     tokenBreakTrailingComment("{", plusTwo);
     builder.blankLineWanted(BlankLineWanted.NO);
     builder.open(plusTwo);
-    boolean first = true;
+    boolean afterFirstToken = false;
     for (CaseTree caseTree : cases) {
-      if (!first) {
+      if (afterFirstToken) {
         builder.blankLineWanted(BlankLineWanted.PRESERVE);
       }
       scan(caseTree, null);
-      first = false;
+      afterFirstToken = true;
     }
     builder.close();
     builder.forcedBreak();
@@ -1954,9 +1955,9 @@ public Void visitTry(TryTree node, Void unused) {
     if (!node.getResources().isEmpty()) {
       token("(");
       builder.open(node.getResources().size() > 1 ? plusFour : ZERO);
-      boolean first = true;
+      boolean afterFirstToken = false;
       for (Tree resource : node.getResources()) {
-        if (!first) {
+        if (afterFirstToken) {
           builder.forcedBreak();
         }
         if (resource instanceof VariableTree) {
@@ -1981,7 +1982,7 @@ public Void visitTry(TryTree node, Void unused) {
           token(";");
           builder.space();
         }
-        first = false;
+        afterFirstToken = true;
       }
       if (builder.peekToken().equals(Optional.of(";"))) {
         token(";");
@@ -2070,15 +2071,15 @@ public Void visitTypeParameter(TypeParameterTree node, Void unused) {
       builder.open(plusFour);
       builder.breakOp(" ");
       builder.open(plusFour);
-      boolean first = true;
+      boolean afterFirstToken = false;
       for (Tree typeBound : node.getBounds()) {
-        if (!first) {
+        if (afterFirstToken) {
           builder.breakToFill(" ");
           token("&");
           builder.space();
         }
         scan(typeBound, null);
-        first = false;
+        afterFirstToken = true;
       }
       builder.close();
       builder.close();
@@ -2134,13 +2135,13 @@ protected void visitAnnotations(
       if (breakBefore.isYes()) {
         builder.breakToFill(" ");
       }
-      boolean first = true;
+      boolean afterFirstToken = false;
       for (AnnotationTree annotation : annotations) {
-        if (!first) {
+        if (afterFirstToken) {
           builder.breakToFill(" ");
         }
         scan(annotation, null);
-        first = false;
+        afterFirstToken = true;
       }
       if (breakAfter.isYes()) {
         builder.breakToFill(" ");
@@ -2220,17 +2221,17 @@ private void visitStatement(
   }
 
   protected void visitStatements(List<? extends StatementTree> statements) {
-    boolean first = true;
+    boolean afterFirstToken = false;
     PeekingIterator<StatementTree> it = Iterators.peekingIterator(statements.iterator());
     dropEmptyDeclarations();
     while (it.hasNext()) {
       StatementTree tree = it.next();
       builder.forcedBreak();
-      if (!first) {
+      if (afterFirstToken) {
         builder.blankLineWanted(BlankLineWanted.PRESERVE);
       }
       markForPartialFormat();
-      first = false;
+      afterFirstToken = true;
       List<VariableTree> fragments = variableFragments(it, tree);
       if (!fragments.isEmpty()) {
         visitVariables(
@@ -2300,17 +2301,17 @@ private ImmutableList<AnnotationTree> visitModifiers(
     Deque<AnnotationOrModifier> declarationModifiers =
         new ArrayDeque<>(splitModifiers.declarationModifiers());
     builder.open(ZERO);
-    boolean first = true;
+    boolean afterFirstToken = false;
     boolean lastWasAnnotation = false;
     while (!declarationModifiers.isEmpty() && !declarationModifiers.peekFirst().isModifier()) {
-      if (!first) {
+      if (afterFirstToken) {
         builder.addAll(
             annotationsDirection.isVertical()
                 ? forceBreakList(declarationAnnotationBreak)
                 : breakList(declarationAnnotationBreak));
       }
       formatAnnotationOrModifier(declarationModifiers);
-      first = false;
+      afterFirstToken = true;
       lastWasAnnotation = true;
     }
     builder.close();
@@ -2327,13 +2328,13 @@ private ImmutableList<AnnotationTree> visitModifiers(
     }
 
     builder.open(ZERO);
-    first = true;
+    afterFirstToken = false;
     while (!declarationModifiers.isEmpty()) {
-      if (!first) {
+      if (afterFirstToken) {
         builder.addAll(breakFillList(Optional.empty()));
       }
       formatAnnotationOrModifier(declarationModifiers);
-      first = false;
+      afterFirstToken = true;
     }
     builder.close();
     builder.addAll(breakFillList(Optional.empty()));
@@ -2556,14 +2557,14 @@ private void visitUnionType(VariableTree declaration) {
         Direction.HORIZONTAL,
         /* declarationAnnotationBreak= */ Optional.empty());
     List<? extends Tree> union = type.getTypeAlternatives();
-    boolean first = true;
+    boolean afterFirstToken = false;
     for (int i = 0; i < union.size() - 1; i++) {
-      if (!first) {
+      if (afterFirstToken) {
         builder.breakOp(" ");
         token("|");
         builder.space();
       } else {
-        first = false;
+        afterFirstToken = true;
       }
       scan(union.get(i), null);
     }
@@ -2612,7 +2613,7 @@ protected void visitFormals(
       return;
     }
     builder.open(ZERO);
-    boolean first = true;
+    boolean afterFirstToken = false;
     if (receiver.isPresent()) {
       // TODO(user): Use builders.
       declareOne(
@@ -2627,11 +2628,11 @@ protected void visitFormals(
           !parameters.isEmpty() ? Optional.of(",") : Optional.empty(),
           Optional.of(receiver.get().getNameExpression()),
           /* typeWithDims= */ Optional.empty());
-      first = false;
+      afterFirstToken = true;
     }
     for (int i = 0; i < parameters.size(); i++) {
       VariableTree parameter = parameters.get(i);
-      if (!first) {
+      if (afterFirstToken) {
         builder.breakOp(" ");
       }
       visitToDeclare(
@@ -2641,7 +2642,7 @@ protected void visitFormals(
           /* initializer= */ Optional.empty(),
           "=",
           i < parameters.size() - 1 ? Optional.of(",") : /* a= */ Optional.empty());
-      first = false;
+      afterFirstToken = true;
     }
     builder.close();
   }
@@ -2650,14 +2651,14 @@ protected void visitFormals(
   private void visitThrowsClause(List<? extends ExpressionTree> thrownExceptionTypes) {
     token("throws");
     builder.breakToFill(" ");
-    boolean first = true;
+    boolean afterFirstToken = false;
     for (ExpressionTree thrownExceptionType : thrownExceptionTypes) {
-      if (!first) {
+      if (afterFirstToken) {
         token(",");
         builder.breakOp(" ");
       }
       scan(thrownExceptionType, null);
-      first = false;
+      afterFirstToken = true;
     }
   }
 
@@ -2721,14 +2722,14 @@ private void visitDirective(
       builder.space();
       token(separator);
       builder.forcedBreak();
-      boolean first = true;
+      boolean afterFirstToken = false;
       for (ExpressionTree item : items) {
-        if (!first) {
+        if (afterFirstToken) {
           token(",");
           builder.forcedBreak();
         }
         scan(item, null);
-        first = false;
+        afterFirstToken = true;
       }
       token(";");
       builder.close();
@@ -2791,13 +2792,13 @@ private void visitName(Tree node) {
       stack.addFirst(((MemberSelectTree) node).getIdentifier());
     }
     stack.addFirst(((IdentifierTree) node).getName());
-    boolean first = true;
+    boolean afterFirstToken = false;
     for (Name name : stack) {
-      if (!first) {
+      if (afterFirstToken) {
         token(".");
       }
       token(name.toString());
-      first = false;
+      afterFirstToken = true;
     }
   }
 
@@ -2839,14 +2840,14 @@ protected void typeParametersRest(
     builder.open(plusIndent);
     builder.breakOp();
     builder.open(ZERO);
-    boolean first = true;
+    boolean afterFirstToken = false;
     for (TypeParameterTree typeParameter : typeParameters) {
-      if (!first) {
+      if (afterFirstToken) {
         token(",");
         builder.breakOp(" ");
       }
       scan(typeParameter, null);
-      first = false;
+      afterFirstToken = true;
     }
     token(">");
     builder.close();
@@ -3238,14 +3239,14 @@ void addTypeArguments(List<? extends Tree> typeArguments, Indent plusIndent) {
     }
     token("<");
     builder.open(plusIndent);
-    boolean first = true;
+    boolean afterFirstToken = false;
     for (Tree typeArgument : typeArguments) {
-      if (!first) {
+      if (afterFirstToken) {
         token(",");
         builder.breakToFill(" ");
       }
       scan(typeArgument, null);
-      first = false;
+      afterFirstToken = true;
     }
     builder.close();
     token(">");
@@ -3266,11 +3267,11 @@ void addArguments(List<? extends ExpressionTree> arguments, Indent plusIndent) {
       if (arguments.size() % 2 == 0 && argumentsAreTabular(arguments) == 2) {
         builder.forcedBreak();
         builder.open(ZERO);
-        boolean first = true;
+        boolean afterFirstToken = false;
         for (int i = 0; i < arguments.size() - 1; i += 2) {
           ExpressionTree argument0 = arguments.get(i);
           ExpressionTree argument1 = arguments.get(i + 1);
-          if (!first) {
+          if (afterFirstToken) {
             token(",");
             builder.forcedBreak();
           }
@@ -3280,7 +3281,7 @@ void addArguments(List<? extends ExpressionTree> arguments, Indent plusIndent) {
           builder.breakOp(" ");
           scan(argument1, null);
           builder.close();
-          first = false;
+          afterFirstToken = true;
         }
         builder.close();
       } else if (isFormatMethod(arguments)) {
@@ -3304,15 +3305,15 @@ void addArguments(List<? extends ExpressionTree> arguments, Indent plusIndent) {
 
   private void argList(List<? extends ExpressionTree> arguments) {
     builder.open(ZERO);
-    boolean first = true;
+    boolean afterFirstToken = false;
     FillMode fillMode = hasOnlyShortItems(arguments) ? FillMode.INDEPENDENT : FillMode.UNIFIED;
     for (ExpressionTree argument : arguments) {
-      if (!first) {
+      if (afterFirstToken) {
         token(",");
         builder.breakOp(fillMode, " ", ZERO);
       }
       scan(argument, null);
-      first = false;
+      afterFirstToken = true;
     }
     builder.close();
   }
@@ -3701,12 +3702,13 @@ private void declareMany(List<VariableTree> fragments, Direction annotationDirec
     int baseDims = dims.size();
     maybeAddDims(dims);
     baseDims = baseDims - dims.size();
-    boolean first = true;
+    boolean afterFirstToken = false;
     for (VariableTree fragment : fragments) {
-      if (!first) {
+      if (afterFirstToken) {
         token(",");
       }
-      TypeWithDims fragmentDims = variableFragmentDims(first, baseDims, fragment.getType());
+      TypeWithDims fragmentDims =
+          variableFragmentDims(afterFirstToken, baseDims, fragment.getType());
       dims = new ArrayDeque<>(fragmentDims.dims);
       builder.breakOp(" ");
       builder.open(ZERO);
@@ -3723,10 +3725,10 @@ private void declareMany(List<VariableTree> fragments, Direction annotationDirec
         builder.close();
       }
       builder.close();
-      if (first) {
+      if (!afterFirstToken) {
         builder.close();
       }
-      first = false;
+      afterFirstToken = true;
     }
     builder.close();
     token(";");
@@ -3805,14 +3807,14 @@ private void classDeclarationTypeList(String token, List<? extends Tree> types)
     builder.open(types.size() > 1 ? plusFour : ZERO);
     token(token);
     builder.space();
-    boolean first = true;
+    boolean afterFirstToken = false;
     for (Tree type : types) {
-      if (!first) {
+      if (afterFirstToken) {
         token(",");
         builder.breakOp(" ");
       }
       scan(type, null);
-      first = false;
+      afterFirstToken = true;
     }
     builder.close();
   }
diff --git a/core/src/main/java/com/google/googlejavaformat/java/java17/Java17InputAstVisitor.java b/core/src/main/java/com/google/googlejavaformat/java/java17/Java17InputAstVisitor.java
index a7b5dbc44..e502f49a1 100644
--- a/core/src/main/java/com/google/googlejavaformat/java/java17/Java17InputAstVisitor.java
+++ b/core/src/main/java/com/google/googlejavaformat/java/java17/Java17InputAstVisitor.java
@@ -55,10 +55,10 @@ public Java17InputAstVisitor(OpsBuilder builder, int indentMultiplier) {
   }
 
   @Override
-  protected void handleModule(boolean first, CompilationUnitTree node) {
+  protected void handleModule(boolean afterFirstToken, CompilationUnitTree node) {
     ModuleTree module = node.getModule();
     if (module != null) {
-      if (!first) {
+      if (afterFirstToken) {
         builder.blankLineWanted(BlankLineWanted.YES);
       }
       markForPartialFormat();
@@ -167,14 +167,14 @@ public void visitRecordDeclaration(ClassTree node) {
         builder.open(node.getImplementsClause().size() > 1 ? plusFour : ZERO);
         token("implements");
         builder.space();
-        boolean first = true;
+        boolean afterFirstToken = false;
         for (Tree superInterfaceType : node.getImplementsClause()) {
-          if (!first) {
+          if (afterFirstToken) {
             token(",");
             builder.breakOp(" ");
           }
           scan(superInterfaceType, null);
-          first = false;
+          afterFirstToken = true;
         }
         builder.close();
       }
@@ -238,14 +238,14 @@ public Void visitCase(CaseTree node, Void unused) {
       token("case", plusTwo);
       builder.open(labels.size() > 1 ? plusFour : ZERO);
       builder.space();
-      boolean first = true;
+      boolean afterFirstToken = false;
       for (Tree expression : labels) {
-        if (!first) {
+        if (afterFirstToken) {
           token(",");
           builder.breakOp(" ");
         }
         scan(expression, null);
-        first = false;
+        afterFirstToken = true;
       }
       builder.close();
     }
diff --git a/core/src/main/java/com/google/googlejavaformat/java/java21/Java21InputAstVisitor.java b/core/src/main/java/com/google/googlejavaformat/java/java21/Java21InputAstVisitor.java
index 5ef81fad6..8ab04e665 100644
--- a/core/src/main/java/com/google/googlejavaformat/java/java21/Java21InputAstVisitor.java
+++ b/core/src/main/java/com/google/googlejavaformat/java/java21/Java21InputAstVisitor.java
@@ -66,13 +66,13 @@ public Void visitDeconstructionPattern(DeconstructionPatternTree node, Void unus
     builder.open(plusFour);
     token("(");
     builder.breakOp();
-    boolean first = true;
+    boolean afterFirstToken = false;
     for (PatternTree pattern : node.getNestedPatterns()) {
-      if (!first) {
+      if (afterFirstToken) {
         token(",");
         builder.breakOp(" ");
       }
-      first = false;
+      afterFirstToken = true;
       scan(pattern, null);
     }
     builder.close();