 import SwiftSyntaxBuilder
 
 let tokensFile = SourceFile {
-  ImportDecl(importTok: TokenSyntax.import.withLeadingTrivia(.docLineComment(copyrightHeader)), path: "SwiftSyntax")
+  ImportDecl(
+    leadingTrivia: .docLineComment(copyrightHeader),
+    path: "SwiftSyntax"
+  )
 
   ExtensionDecl(
-    modifiers: [TokenSyntax.public.withLeadingTrivia(.newlines(1) + .docLineComment("/// Namespace for commonly used tokens with default trivia.") + .newlines(1))],
+    leadingTrivia: .newlines(1) + .docLineComment("/// Namespace for commonly used tokens with default trivia.") + .newlines(1),
+    modifiers: [TokenSyntax.public],
     extendedType: "TokenSyntax"
   ) {
     for token in SYNTAX_TOKENS {
       if token.isKeyword {
         VariableDecl(
-          modifiers: [token.text.map { TokenSyntax.static.withLeadingTrivia(.newlines(1) + .docLineComment("/// The `\($0)` keyword") + .newlines(1)) } ?? TokenSyntax.static],
+          leadingTrivia: token.text.map { .newlines(1) + .docLineComment("/// The `\($0)` keyword") + .newlines(1) } ?? [],
+          modifiers: [TokenSyntax.static],
           letOrVarKeyword: .var
         ) {
           // We need to use `CodeBlock` here to ensure there is braces around.

      }
    }
    VariableDecl(
      modifiers: [TokenSyntax.static.withLeadingTrivia(.newlines(1) + .docLineComment("/// The `eof` token") + .newlines(1))],
      letOrVarKeyword: .var
    ) {
      // We need to use `CodeBlock` here to ensure there is braces around.

      createTokenSyntaxPatternBinding("eof", accessor: body)
    }
    VariableDecl(
      leadingTrivia: .newlines(1) + .docLineComment("/// The `open` contextual token") + .newlines(1),
      modifiers: [TokenSyntax.static],
      letOrVarKeyword: .var
    ) {
      // We need to use `CodeBlock` here to ensure there is braces around.
