diff --git a/Sources/SwiftSyntaxBuilder/Buildables.swift.gyb b/Sources/SwiftSyntaxBuilder/Buildables.swift.gyb
index 8332eecc900..38b5cd88150 100644
--- a/Sources/SwiftSyntaxBuilder/Buildables.swift.gyb
+++ b/Sources/SwiftSyntaxBuilder/Buildables.swift.gyb
@@ -2,7 +2,7 @@
   from gyb_syntax_support import *
   from gyb_syntax_support.kinds import lowercase_first_word
   from gyb_syntax_support.kinds import SYNTAX_BASE_KINDS
-  from gyb_syntax_support.kinds import syntax_buildable_child_type
+  from gyb_syntax_support.kinds import syntax_buildable_child_type, syntax_buildable_default_init_value
   # -*- mode: Swift -*-
   # Ignore the following admonition it applies to the resulting .swift file only
 }%
@@ -103,8 +103,9 @@ public struct ${node.syntax_kind}: ${node.base_kind}Buildable {
   public init(
 %     init_parameters = []
 %     for child in node.children:
+%       child_token = SYNTAX_TOKEN_MAP.get(child.syntax_kind)
 %       param_type = syntax_buildable_child_type(child.type_name, child.syntax_kind, child.is_token(), child.is_optional)
-%       default_value = " = nil" if child.is_optional else ""
+%       default_value = syntax_buildable_default_init_value(child, child_token)
 %       init_parameters.append("%s: %s%s" % (child.swift_name, param_type, default_value))
 %     end
     ${',\n    '.join(init_parameters)}
diff --git a/Sources/SwiftSyntaxBuilder/BuildablesConvenienceInitializers.swift.gyb b/Sources/SwiftSyntaxBuilder/BuildablesConvenienceInitializers.swift.gyb
index f1eae7a501e..ce7b85a65ff 100644
--- a/Sources/SwiftSyntaxBuilder/BuildablesConvenienceInitializers.swift.gyb
+++ b/Sources/SwiftSyntaxBuilder/BuildablesConvenienceInitializers.swift.gyb
@@ -1,11 +1,11 @@
 %{
   from gyb_syntax_support import *
-  from gyb_syntax_support.kinds import SYNTAX_BASE_KINDS, lowercase_first_word, syntax_buildable_child_type
+  from gyb_syntax_support.kinds import SYNTAX_BASE_KINDS, lowercase_first_word, syntax_buildable_child_type, syntax_buildable_default_init_value
   NODE_MAP = create_node_map()
   # -*- mode: Swift -*-
   # Ignore the following admonition it applies to the resulting .swift file only
 }%
-//// Automatically Generated From DeclBuildables.swift.gyb.
+//// Automatically Generated From BuildablesConvenienceInitializers.swift.gyb.
 //// Do Not Edit Directly!
 //===----------------------------------------------------------------------===//
 //
@@ -23,36 +23,35 @@ import SwiftSyntax
 
 % for node in SYNTAX_NODES:
 %   if node.is_buildable():
-%     has_syntax_collection_child = False
+%     should_create_convenience_initializer = False
 %     for child in node.children:
 %       child_node = NODE_MAP.get(child.syntax_kind)
-%       if child_node and child_node.is_syntax_collection():
-%         has_syntax_collection_child = True
+%       child_token = SYNTAX_TOKEN_MAP.get(child.syntax_kind)
+%       if (child_node and child_node.is_syntax_collection()) or (child_token and not child_token.text):
+%         # If the child token doesn’t have a text, we can create a convenience initializer that takes a string.
+%         # If the child token doesn’t have a text, it takes a String as parameter, we can create a convenient initializer.
+%         should_create_convenience_initializer = True
 %       end
 %     end
-%     if has_syntax_collection_child:
+%     if should_create_convenience_initializer:
 extension ${node.syntax_kind} {
   public init(
 %       init_parameters = []
 %       for child in node.children:
 %         child_node = NODE_MAP.get(child.syntax_kind)
-%         token = SYNTAX_TOKEN_MAP.get(child.syntax_kind)
+%         child_token = SYNTAX_TOKEN_MAP.get(child.syntax_kind)
 %         if child_node and child_node.is_syntax_collection():
 %           # Allow initializing syntax collections with result builders
 %           default_value = "? = { nil }" if child.is_optional else " = { .empty }"
 %           init_parameters.append("@%sBuilder %sBuilder: () -> %s%s" % (child.syntax_kind, child.swift_name, child.syntax_kind, default_value))
-%         elif child.syntax_kind is "IdentifierToken" or (token and not token.text):
+%         elif child_token and not child_token.text:
 %           # Allow initializing identifier or a token without a text with String value
 %           param_type = "String?" if child.is_optional else "String"
 %           init_parameters.append("%s: %s" % (child.swift_name, param_type))
 %         else:
 %           # When type is not handled above, use default value
 %           param_type = syntax_buildable_child_type(child.type_name, child.syntax_kind, child.is_token(), child.is_optional)
-%           default_value = ""
-%           if token and token.text and not child.is_optional:
-%             default_value = " = Tokens.`%s`" % lowercase_first_word(token.name)
-%           elif child.is_optional:
-%             default_value = " = nil"
+%           default_value = syntax_buildable_default_init_value(child, child_token)
 %           init_parameters.append("%s: %s%s" % (child.swift_name, param_type, default_value))
 %         end
 %       end
@@ -75,7 +74,7 @@ extension ${node.syntax_kind} {
 %         if child.is_optional:
 %           init_parameters.append("%s: %s.map(Tokens.%s)" % (child.swift_name, child.swift_name, lowercase_first_word(token.name)))
 %         else:
-%           init_parameters.append("%s: Tokens.%s(%s)" % (child.swift_name, token.name, child.swift_name))
+%           init_parameters.append("%s: Tokens.%s(%s)" % (child.swift_name, lowercase_first_word(token.name), child.swift_name))
 %         end
 %       else:
 %         init_parameters.append("%s: %s" % (child.swift_name, child.swift_name))
@@ -88,4 +87,4 @@ extension ${node.syntax_kind} {
 
 %     end
 %   end
-% end
\ No newline at end of file
+% end
diff --git a/Sources/SwiftSyntaxBuilder/gyb_generated/Buildables.swift b/Sources/SwiftSyntaxBuilder/gyb_generated/Buildables.swift
index 8f6f7a6a7f6..b66da3e80b0 100644
--- a/Sources/SwiftSyntaxBuilder/gyb_generated/Buildables.swift
+++ b/Sources/SwiftSyntaxBuilder/gyb_generated/Buildables.swift
@@ -362,9 +362,9 @@ public struct CodeBlock: SyntaxBuildable {
   let rightBrace: TokenSyntax
 
   public init(
-    leftBrace: TokenSyntax,
+    leftBrace: TokenSyntax = Tokens.`leftBrace`,
     statements: CodeBlockItemList,
-    rightBrace: TokenSyntax
+    rightBrace: TokenSyntax = Tokens.`rightBrace`
   ) {
     self.leftBrace = leftBrace
     self.statements = statements
@@ -397,7 +397,7 @@ public struct InOutExpr: ExprBuildable {
   let expression: ExprBuildable
 
   public init(
-    ampersand: TokenSyntax,
+    ampersand: TokenSyntax = Tokens.`prefixAmpersand`,
     expression: ExprBuildable
   ) {
     self.ampersand = ampersand
@@ -428,7 +428,7 @@ public struct PoundColumnExpr: ExprBuildable {
   let poundColumn: TokenSyntax
 
   public init(
-    poundColumn: TokenSyntax
+    poundColumn: TokenSyntax = Tokens.`poundColumn`
   ) {
     self.poundColumn = poundColumn
   }
@@ -570,7 +570,7 @@ public struct TryExpr: ExprBuildable {
   let expression: ExprBuildable
 
   public init(
-    tryKeyword: TokenSyntax,
+    tryKeyword: TokenSyntax = Tokens.`try`,
     questionOrExclamationMark: TokenSyntax? = nil,
     expression: ExprBuildable
   ) {
@@ -638,7 +638,7 @@ public struct DeclNameArgument: SyntaxBuildable {
 
   public init(
     name: TokenSyntax,
-    colon: TokenSyntax
+    colon: TokenSyntax = Tokens.`colon`
   ) {
     self.name = name
     self.colon = colon
@@ -698,9 +698,9 @@ public struct DeclNameArguments: SyntaxBuildable {
   let rightParen: TokenSyntax
 
   public init(
-    leftParen: TokenSyntax,
+    leftParen: TokenSyntax = Tokens.`leftParen`,
     arguments: DeclNameArgumentList,
-    rightParen: TokenSyntax
+    rightParen: TokenSyntax = Tokens.`rightParen`
   ) {
     self.leftParen = leftParen
     self.arguments = arguments
@@ -764,7 +764,7 @@ public struct SuperRefExpr: ExprBuildable {
   let superKeyword: TokenSyntax
 
   public init(
-    superKeyword: TokenSyntax
+    superKeyword: TokenSyntax = Tokens.`super`
   ) {
     self.superKeyword = superKeyword
   }
@@ -792,7 +792,7 @@ public struct NilLiteralExpr: ExprBuildable {
   let nilKeyword: TokenSyntax
 
   public init(
-    nilKeyword: TokenSyntax
+    nilKeyword: TokenSyntax = Tokens.`nil`
   ) {
     self.nilKeyword = nilKeyword
   }
@@ -820,7 +820,7 @@ public struct DiscardAssignmentExpr: ExprBuildable {
   let wildcard: TokenSyntax
 
   public init(
-    wildcard: TokenSyntax
+    wildcard: TokenSyntax = Tokens.`wildcard`
   ) {
     self.wildcard = wildcard
   }
@@ -848,7 +848,7 @@ public struct AssignmentExpr: ExprBuildable {
   let assignToken: TokenSyntax
 
   public init(
-    assignToken: TokenSyntax
+    assignToken: TokenSyntax = Tokens.`equal`
   ) {
     self.assignToken = assignToken
   }
@@ -934,7 +934,7 @@ public struct PoundLineExpr: ExprBuildable {
   let poundLine: TokenSyntax
 
   public init(
-    poundLine: TokenSyntax
+    poundLine: TokenSyntax = Tokens.`poundLine`
   ) {
     self.poundLine = poundLine
   }
@@ -962,7 +962,7 @@ public struct PoundFileExpr: ExprBuildable {
   let poundFile: TokenSyntax
 
   public init(
-    poundFile: TokenSyntax
+    poundFile: TokenSyntax = Tokens.`poundFile`
   ) {
     self.poundFile = poundFile
   }
@@ -990,7 +990,7 @@ public struct PoundFileIDExpr: ExprBuildable {
   let poundFileID: TokenSyntax
 
   public init(
-    poundFileID: TokenSyntax
+    poundFileID: TokenSyntax = Tokens.`poundFileID`
   ) {
     self.poundFileID = poundFileID
   }
@@ -1018,7 +1018,7 @@ public struct PoundFilePathExpr: ExprBuildable {
   let poundFilePath: TokenSyntax
 
   public init(
-    poundFilePath: TokenSyntax
+    poundFilePath: TokenSyntax = Tokens.`poundFilePath`
   ) {
     self.poundFilePath = poundFilePath
   }
@@ -1046,7 +1046,7 @@ public struct PoundFunctionExpr: ExprBuildable {
   let poundFunction: TokenSyntax
 
   public init(
-    poundFunction: TokenSyntax
+    poundFunction: TokenSyntax = Tokens.`poundFunction`
   ) {
     self.poundFunction = poundFunction
   }
@@ -1074,7 +1074,7 @@ public struct PoundDsohandleExpr: ExprBuildable {
   let poundDsohandle: TokenSyntax
 
   public init(
-    poundDsohandle: TokenSyntax
+    poundDsohandle: TokenSyntax = Tokens.`poundDsohandle`
   ) {
     self.poundDsohandle = poundDsohandle
   }
@@ -1198,7 +1198,7 @@ public struct ArrowExpr: ExprBuildable {
   public init(
     asyncKeyword: TokenSyntax? = nil,
     throwsToken: TokenSyntax? = nil,
-    arrowToken: TokenSyntax
+    arrowToken: TokenSyntax = Tokens.`arrow`
   ) {
     self.asyncKeyword = asyncKeyword
     self.throwsToken = throwsToken
@@ -1260,9 +1260,9 @@ public struct TupleExpr: ExprBuildable {
   let rightParen: TokenSyntax
 
   public init(
-    leftParen: TokenSyntax,
+    leftParen: TokenSyntax = Tokens.`leftParen`,
     elementList: TupleExprElementList,
-    rightParen: TokenSyntax
+    rightParen: TokenSyntax = Tokens.`rightParen`
   ) {
     self.leftParen = leftParen
     self.elementList = elementList
@@ -1296,9 +1296,9 @@ public struct ArrayExpr: ExprBuildable {
   let rightSquare: TokenSyntax
 
   public init(
-    leftSquare: TokenSyntax,
+    leftSquare: TokenSyntax = Tokens.`leftSquareBracket`,
     elements: ArrayElementList,
-    rightSquare: TokenSyntax
+    rightSquare: TokenSyntax = Tokens.`rightSquareBracket`
   ) {
     self.leftSquare = leftSquare
     self.elements = elements
@@ -1332,9 +1332,9 @@ public struct DictionaryExpr: ExprBuildable {
   let rightSquare: TokenSyntax
 
   public init(
-    leftSquare: TokenSyntax,
+    leftSquare: TokenSyntax = Tokens.`leftSquareBracket`,
     content: SyntaxBuildable,
-    rightSquare: TokenSyntax
+    rightSquare: TokenSyntax = Tokens.`rightSquareBracket`
   ) {
     self.leftSquare = leftSquare
     self.content = content
@@ -1442,7 +1442,7 @@ public struct DictionaryElement: SyntaxBuildable {
 
   public init(
     keyExpression: ExprBuildable,
-    colon: TokenSyntax,
+    colon: TokenSyntax = Tokens.`colon`,
     valueExpression: ExprBuildable,
     trailingComma: TokenSyntax? = nil
   ) {
@@ -1539,9 +1539,9 @@ public struct TernaryExpr: ExprBuildable {
 
   public init(
     conditionExpression: ExprBuildable,
-    questionMark: TokenSyntax,
+    questionMark: TokenSyntax = Tokens.`infixQuestionMark`,
     firstChoice: ExprBuildable,
-    colonMark: TokenSyntax,
+    colonMark: TokenSyntax = Tokens.`colon`,
     secondChoice: ExprBuildable
   ) {
     self.conditionExpression = conditionExpression
@@ -1619,7 +1619,7 @@ public struct IsExpr: ExprBuildable {
   let typeName: TypeBuildable
 
   public init(
-    isTok: TokenSyntax,
+    isTok: TokenSyntax = Tokens.`is`,
     typeName: TypeBuildable
   ) {
     self.isTok = isTok
@@ -1652,7 +1652,7 @@ public struct AsExpr: ExprBuildable {
   let typeName: TypeBuildable
 
   public init(
-    asTok: TokenSyntax,
+    asTok: TokenSyntax = Tokens.`as`,
     questionOrExclamationMark: TokenSyntax? = nil,
     typeName: TypeBuildable
   ) {
@@ -1788,9 +1788,9 @@ public struct ClosureCaptureSignature: SyntaxBuildable {
   let rightSquare: TokenSyntax
 
   public init(
-    leftSquare: TokenSyntax,
+    leftSquare: TokenSyntax = Tokens.`leftSquareBracket`,
     items: ClosureCaptureItemList? = nil,
-    rightSquare: TokenSyntax
+    rightSquare: TokenSyntax = Tokens.`rightSquareBracket`
   ) {
     self.leftSquare = leftSquare
     self.items = items
@@ -1894,7 +1894,7 @@ public struct ClosureSignature: SyntaxBuildable {
     asyncKeyword: TokenSyntax? = nil,
     throwsTok: TokenSyntax? = nil,
     output: ReturnClause? = nil,
-    inTok: TokenSyntax
+    inTok: TokenSyntax = Tokens.`in`
   ) {
     self.attributes = attributes
     self.capture = capture
@@ -1937,10 +1937,10 @@ public struct ClosureExpr: ExprBuildable {
   let rightBrace: TokenSyntax
 
   public init(
-    leftBrace: TokenSyntax,
+    leftBrace: TokenSyntax = Tokens.`leftBrace`,
     signature: ClosureSignature? = nil,
     statements: CodeBlockItemList,
-    rightBrace: TokenSyntax
+    rightBrace: TokenSyntax = Tokens.`rightBrace`
   ) {
     self.leftBrace = leftBrace
     self.signature = signature
@@ -2005,7 +2005,7 @@ public struct MultipleTrailingClosureElement: SyntaxBuildable {
 
   public init(
     label: TokenSyntax,
-    colon: TokenSyntax,
+    colon: TokenSyntax = Tokens.`colon`,
     closure: ClosureExpr
   ) {
     self.label = label
@@ -2120,9 +2120,9 @@ public struct SubscriptExpr: ExprBuildable {
 
   public init(
     calledExpression: ExprBuildable,
-    leftBracket: TokenSyntax,
+    leftBracket: TokenSyntax = Tokens.`leftSquareBracket`,
     argumentList: TupleExprElementList,
-    rightBracket: TokenSyntax,
+    rightBracket: TokenSyntax = Tokens.`rightSquareBracket`,
     trailingClosure: ClosureExpr? = nil,
     additionalTrailingClosures: MultipleTrailingClosureElementList? = nil
   ) {
@@ -2164,7 +2164,7 @@ public struct OptionalChainingExpr: ExprBuildable {
 
   public init(
     expression: ExprBuildable,
-    questionMark: TokenSyntax
+    questionMark: TokenSyntax = Tokens.`postfixQuestionMark`
   ) {
     self.expression = expression
     self.questionMark = questionMark
@@ -2196,7 +2196,7 @@ public struct ForcedValueExpr: ExprBuildable {
 
   public init(
     expression: ExprBuildable,
-    exclamationMark: TokenSyntax
+    exclamationMark: TokenSyntax = Tokens.`exclamationMark`
   ) {
     self.expression = expression
     self.exclamationMark = exclamationMark
@@ -2322,11 +2322,11 @@ public struct ExpressionSegment: SyntaxBuildable {
   let rightParen: TokenSyntax
 
   public init(
-    backslash: TokenSyntax,
+    backslash: TokenSyntax = Tokens.`backslash`,
     delimiter: TokenSyntax? = nil,
-    leftParen: TokenSyntax,
+    leftParen: TokenSyntax = Tokens.`leftParen`,
     expressions: TupleExprElementList,
-    rightParen: TokenSyntax
+    rightParen: TokenSyntax = Tokens.`stringInterpolationAnchor`
   ) {
     self.backslash = backslash
     self.delimiter = delimiter
@@ -2408,7 +2408,7 @@ public struct KeyPathExpr: ExprBuildable {
   let expression: ExprBuildable
 
   public init(
-    backslash: TokenSyntax,
+    backslash: TokenSyntax = Tokens.`backslash`,
     rootExpr: ExprBuildable? = nil,
     expression: ExprBuildable
   ) {
@@ -2442,7 +2442,7 @@ public struct KeyPathBaseExpr: ExprBuildable {
   let period: TokenSyntax
 
   public init(
-    period: TokenSyntax
+    period: TokenSyntax = Tokens.`period`
   ) {
     self.period = period
   }
@@ -2533,10 +2533,10 @@ public struct ObjcKeyPathExpr: ExprBuildable {
   let rightParen: TokenSyntax
 
   public init(
-    keyPath: TokenSyntax,
-    leftParen: TokenSyntax,
+    keyPath: TokenSyntax = Tokens.`poundKeyPath`,
+    leftParen: TokenSyntax = Tokens.`leftParen`,
     name: ObjcName,
-    rightParen: TokenSyntax
+    rightParen: TokenSyntax = Tokens.`rightParen`
   ) {
     self.keyPath = keyPath
     self.leftParen = leftParen
@@ -2575,12 +2575,12 @@ public struct ObjcSelectorExpr: ExprBuildable {
   let rightParen: TokenSyntax
 
   public init(
-    poundSelector: TokenSyntax,
-    leftParen: TokenSyntax,
+    poundSelector: TokenSyntax = Tokens.`poundSelector`,
+    leftParen: TokenSyntax = Tokens.`leftParen`,
     kind: TokenSyntax? = nil,
     colon: TokenSyntax? = nil,
     name: ExprBuildable,
-    rightParen: TokenSyntax
+    rightParen: TokenSyntax = Tokens.`rightParen`
   ) {
     self.poundSelector = poundSelector
     self.leftParen = leftParen
@@ -2682,9 +2682,9 @@ public struct ObjectLiteralExpr: ExprBuildable {
 
   public init(
     identifier: TokenSyntax,
-    leftParen: TokenSyntax,
+    leftParen: TokenSyntax = Tokens.`leftParen`,
     arguments: TupleExprElementList,
-    rightParen: TokenSyntax
+    rightParen: TokenSyntax = Tokens.`rightParen`
   ) {
     self.identifier = identifier
     self.leftParen = leftParen
@@ -2719,7 +2719,7 @@ public struct TypeInitializerClause: SyntaxBuildable {
   let value: TypeBuildable
 
   public init(
-    equal: TokenSyntax,
+    equal: TokenSyntax = Tokens.`equal`,
     value: TypeBuildable
   ) {
     self.equal = equal
@@ -2758,7 +2758,7 @@ public struct TypealiasDecl: DeclBuildable {
   public init(
     attributes: AttributeList? = nil,
     modifiers: ModifierList? = nil,
-    typealiasKeyword: TokenSyntax,
+    typealiasKeyword: TokenSyntax = Tokens.`typealias`,
     identifier: TokenSyntax,
     genericParameterClause: GenericParameterClause? = nil,
     initializer: TypeInitializerClause? = nil,
@@ -2810,7 +2810,7 @@ public struct AssociatedtypeDecl: DeclBuildable {
   public init(
     attributes: AttributeList? = nil,
     modifiers: ModifierList? = nil,
-    associatedtypeKeyword: TokenSyntax,
+    associatedtypeKeyword: TokenSyntax = Tokens.`associatedtype`,
     identifier: TokenSyntax,
     inheritanceClause: TypeInheritanceClause? = nil,
     initializer: TypeInitializerClause? = nil,
@@ -2884,9 +2884,9 @@ public struct ParameterClause: SyntaxBuildable {
   let rightParen: TokenSyntax
 
   public init(
-    leftParen: TokenSyntax,
+    leftParen: TokenSyntax = Tokens.`leftParen`,
     parameterList: FunctionParameterList,
-    rightParen: TokenSyntax
+    rightParen: TokenSyntax = Tokens.`rightParen`
   ) {
     self.leftParen = leftParen
     self.parameterList = parameterList
@@ -2919,7 +2919,7 @@ public struct ReturnClause: SyntaxBuildable {
   let returnType: TypeBuildable
 
   public init(
-    arrow: TokenSyntax,
+    arrow: TokenSyntax = Tokens.`arrow`,
     returnType: TypeBuildable
   ) {
     self.arrow = arrow
@@ -3056,7 +3056,7 @@ public struct IfConfigDecl: DeclBuildable {
 
   public init(
     clauses: IfConfigClauseList,
-    poundEndif: TokenSyntax
+    poundEndif: TokenSyntax = Tokens.`poundEndif`
   ) {
     self.clauses = clauses
     self.poundEndif = poundEndif
@@ -3089,10 +3089,10 @@ public struct PoundErrorDecl: DeclBuildable {
   let rightParen: TokenSyntax
 
   public init(
-    poundError: TokenSyntax,
-    leftParen: TokenSyntax,
+    poundError: TokenSyntax = Tokens.`poundError`,
+    leftParen: TokenSyntax = Tokens.`leftParen`,
     message: StringLiteralExpr,
-    rightParen: TokenSyntax
+    rightParen: TokenSyntax = Tokens.`rightParen`
   ) {
     self.poundError = poundError
     self.leftParen = leftParen
@@ -3129,10 +3129,10 @@ public struct PoundWarningDecl: DeclBuildable {
   let rightParen: TokenSyntax
 
   public init(
-    poundWarning: TokenSyntax,
-    leftParen: TokenSyntax,
+    poundWarning: TokenSyntax = Tokens.`poundWarning`,
+    leftParen: TokenSyntax = Tokens.`leftParen`,
     message: StringLiteralExpr,
-    rightParen: TokenSyntax
+    rightParen: TokenSyntax = Tokens.`rightParen`
   ) {
     self.poundWarning = poundWarning
     self.leftParen = leftParen
@@ -3169,10 +3169,10 @@ public struct PoundSourceLocation: DeclBuildable {
   let rightParen: TokenSyntax
 
   public init(
-    poundSourceLocation: TokenSyntax,
-    leftParen: TokenSyntax,
+    poundSourceLocation: TokenSyntax = Tokens.`poundSourceLocation`,
+    leftParen: TokenSyntax = Tokens.`leftParen`,
     args: PoundSourceLocationArgs? = nil,
-    rightParen: TokenSyntax
+    rightParen: TokenSyntax = Tokens.`rightParen`
   ) {
     self.poundSourceLocation = poundSourceLocation
     self.leftParen = leftParen
@@ -3213,11 +3213,11 @@ public struct PoundSourceLocationArgs: SyntaxBuildable {
 
   public init(
     fileArgLabel: TokenSyntax,
-    fileArgColon: TokenSyntax,
+    fileArgColon: TokenSyntax = Tokens.`colon`,
     fileName: TokenSyntax,
-    comma: TokenSyntax,
+    comma: TokenSyntax = Tokens.`comma`,
     lineArgLabel: TokenSyntax,
-    lineArgColon: TokenSyntax,
+    lineArgColon: TokenSyntax = Tokens.`colon`,
     lineNumber: TokenSyntax
   ) {
     self.fileArgLabel = fileArgLabel
@@ -3359,7 +3359,7 @@ public struct TypeInheritanceClause: SyntaxBuildable {
   let inheritedTypeCollection: InheritedTypeList
 
   public init(
-    colon: TokenSyntax,
+    colon: TokenSyntax = Tokens.`colon`,
     inheritedTypeCollection: InheritedTypeList
   ) {
     self.colon = colon
@@ -3455,7 +3455,7 @@ public struct StructDecl: DeclBuildable {
   public init(
     attributes: AttributeList? = nil,
     modifiers: ModifierList? = nil,
-    structKeyword: TokenSyntax,
+    structKeyword: TokenSyntax = Tokens.`struct`,
     identifier: TokenSyntax,
     genericParameterClause: GenericParameterClause? = nil,
     inheritanceClause: TypeInheritanceClause? = nil,
@@ -3510,7 +3510,7 @@ public struct ProtocolDecl: DeclBuildable {
   public init(
     attributes: AttributeList? = nil,
     modifiers: ModifierList? = nil,
-    protocolKeyword: TokenSyntax,
+    protocolKeyword: TokenSyntax = Tokens.`protocol`,
     identifier: TokenSyntax,
     inheritanceClause: TypeInheritanceClause? = nil,
     genericWhereClause: GenericWhereClause? = nil,
@@ -3562,7 +3562,7 @@ public struct ExtensionDecl: DeclBuildable {
   public init(
     attributes: AttributeList? = nil,
     modifiers: ModifierList? = nil,
-    extensionKeyword: TokenSyntax,
+    extensionKeyword: TokenSyntax = Tokens.`extension`,
     extendedType: TypeBuildable,
     inheritanceClause: TypeInheritanceClause? = nil,
     genericWhereClause: GenericWhereClause? = nil,
@@ -3608,9 +3608,9 @@ public struct MemberDeclBlock: SyntaxBuildable {
   let rightBrace: TokenSyntax
 
   public init(
-    leftBrace: TokenSyntax,
+    leftBrace: TokenSyntax = Tokens.`leftBrace`,
     members: MemberDeclList,
-    rightBrace: TokenSyntax
+    rightBrace: TokenSyntax = Tokens.`rightBrace`
   ) {
     self.leftBrace = leftBrace
     self.members = members
@@ -3739,7 +3739,7 @@ public struct InitializerClause: SyntaxBuildable {
   let value: ExprBuildable
 
   public init(
-    equal: TokenSyntax,
+    equal: TokenSyntax = Tokens.`equal`,
     value: ExprBuildable
   ) {
     self.equal = equal
@@ -3863,7 +3863,7 @@ public struct FunctionDecl: DeclBuildable {
   public init(
     attributes: AttributeList? = nil,
     modifiers: ModifierList? = nil,
-    funcKeyword: TokenSyntax,
+    funcKeyword: TokenSyntax = Tokens.`func`,
     identifier: TokenSyntax,
     genericParameterClause: GenericParameterClause? = nil,
     signature: FunctionSignature,
@@ -3920,7 +3920,7 @@ public struct InitializerDecl: DeclBuildable {
   public init(
     attributes: AttributeList? = nil,
     modifiers: ModifierList? = nil,
-    initKeyword: TokenSyntax,
+    initKeyword: TokenSyntax = Tokens.`init`,
     optionalMark: TokenSyntax? = nil,
     genericParameterClause: GenericParameterClause? = nil,
     parameters: ParameterClause,
@@ -3975,7 +3975,7 @@ public struct DeinitializerDecl: DeclBuildable {
   public init(
     attributes: AttributeList? = nil,
     modifiers: ModifierList? = nil,
-    deinitKeyword: TokenSyntax,
+    deinitKeyword: TokenSyntax = Tokens.`deinit`,
     body: CodeBlock
   ) {
     self.attributes = attributes
@@ -4019,7 +4019,7 @@ public struct SubscriptDecl: DeclBuildable {
   public init(
     attributes: AttributeList? = nil,
     modifiers: ModifierList? = nil,
-    subscriptKeyword: TokenSyntax,
+    subscriptKeyword: TokenSyntax = Tokens.`subscript`,
     genericParameterClause: GenericParameterClause? = nil,
     indices: ParameterClause,
     result: ReturnClause,
@@ -4172,7 +4172,7 @@ public struct ImportDecl: DeclBuildable {
   public init(
     attributes: AttributeList? = nil,
     modifiers: ModifierList? = nil,
-    importTok: TokenSyntax,
+    importTok: TokenSyntax = Tokens.`import`,
     importKind: TokenSyntax? = nil,
     path: AccessPath
   ) {
@@ -4212,9 +4212,9 @@ public struct AccessorParameter: SyntaxBuildable {
   let rightParen: TokenSyntax
 
   public init(
-    leftParen: TokenSyntax,
+    leftParen: TokenSyntax = Tokens.`leftParen`,
     name: TokenSyntax,
-    rightParen: TokenSyntax
+    rightParen: TokenSyntax = Tokens.`rightParen`
   ) {
     self.leftParen = leftParen
     self.name = name
@@ -4328,9 +4328,9 @@ public struct AccessorBlock: SyntaxBuildable {
   let rightBrace: TokenSyntax
 
   public init(
-    leftBrace: TokenSyntax,
+    leftBrace: TokenSyntax = Tokens.`leftBrace`,
     accessors: AccessorList,
-    rightBrace: TokenSyntax
+    rightBrace: TokenSyntax = Tokens.`rightBrace`
   ) {
     self.leftBrace = leftBrace
     self.accessors = accessors
@@ -4555,7 +4555,7 @@ public struct EnumCaseDecl: DeclBuildable {
   public init(
     attributes: AttributeList? = nil,
     modifiers: ModifierList? = nil,
-    caseKeyword: TokenSyntax,
+    caseKeyword: TokenSyntax = Tokens.`case`,
     elements: EnumCaseElementList
   ) {
     self.attributes = attributes
@@ -4600,7 +4600,7 @@ public struct EnumDecl: DeclBuildable {
   public init(
     attributes: AttributeList? = nil,
     modifiers: ModifierList? = nil,
-    enumKeyword: TokenSyntax,
+    enumKeyword: TokenSyntax = Tokens.`enum`,
     identifier: TokenSyntax,
     genericParameters: GenericParameterClause? = nil,
     inheritanceClause: TypeInheritanceClause? = nil,
@@ -4654,7 +4654,7 @@ public struct OperatorDecl: DeclBuildable {
   public init(
     attributes: AttributeList? = nil,
     modifiers: ModifierList? = nil,
-    operatorKeyword: TokenSyntax,
+    operatorKeyword: TokenSyntax = Tokens.`operator`,
     identifier: TokenSyntax,
     operatorPrecedenceAndTypes: OperatorPrecedenceAndTypes? = nil
   ) {
@@ -4722,7 +4722,7 @@ public struct OperatorPrecedenceAndTypes: SyntaxBuildable {
   let precedenceGroupAndDesignatedTypes: IdentifierList
 
   public init(
-    colon: TokenSyntax,
+    colon: TokenSyntax = Tokens.`colon`,
     precedenceGroupAndDesignatedTypes: IdentifierList
   ) {
     self.colon = colon
@@ -4762,11 +4762,11 @@ public struct PrecedenceGroupDecl: DeclBuildable {
   public init(
     attributes: AttributeList? = nil,
     modifiers: ModifierList? = nil,
-    precedencegroupKeyword: TokenSyntax,
+    precedencegroupKeyword: TokenSyntax = Tokens.`precedencegroup`,
     identifier: TokenSyntax,
-    leftBrace: TokenSyntax,
+    leftBrace: TokenSyntax = Tokens.`leftBrace`,
     groupAttributes: PrecedenceGroupAttributeList,
-    rightBrace: TokenSyntax
+    rightBrace: TokenSyntax = Tokens.`rightBrace`
   ) {
     self.attributes = attributes
     self.modifiers = modifiers
@@ -4841,7 +4841,7 @@ public struct PrecedenceGroupRelation: SyntaxBuildable {
 
   public init(
     higherThanOrLowerThan: TokenSyntax,
-    colon: TokenSyntax,
+    colon: TokenSyntax = Tokens.`colon`,
     otherNames: PrecedenceGroupNameList
   ) {
     self.higherThanOrLowerThan = higherThanOrLowerThan
@@ -4941,7 +4941,7 @@ public struct PrecedenceGroupAssignment: SyntaxBuildable {
 
   public init(
     assignmentKeyword: TokenSyntax,
-    colon: TokenSyntax,
+    colon: TokenSyntax = Tokens.`colon`,
     flag: TokenSyntax
   ) {
     self.assignmentKeyword = assignmentKeyword
@@ -4981,7 +4981,7 @@ public struct PrecedenceGroupAssociativity: SyntaxBuildable {
 
   public init(
     associativityKeyword: TokenSyntax,
-    colon: TokenSyntax,
+    colon: TokenSyntax = Tokens.`colon`,
     value: TokenSyntax
   ) {
     self.associativityKeyword = associativityKeyword
@@ -5073,7 +5073,7 @@ public struct CustomAttribute: SyntaxBuildable {
   let rightParen: TokenSyntax?
 
   public init(
-    atSignToken: TokenSyntax,
+    atSignToken: TokenSyntax = Tokens.`atSign`,
     attributeName: TypeBuildable,
     leftParen: TokenSyntax? = nil,
     argumentList: TupleExprElementList? = nil,
@@ -5121,7 +5121,7 @@ public struct Attribute: SyntaxBuildable {
   let tokenList: TokenList?
 
   public init(
-    atSignToken: TokenSyntax,
+    atSignToken: TokenSyntax = Tokens.`atSign`,
     attributeName: TokenSyntax,
     leftParen: TokenSyntax? = nil,
     argument: SyntaxBuildable? = nil,
@@ -5229,7 +5229,7 @@ public struct LabeledSpecializeEntry: SyntaxBuildable {
 
   public init(
     label: TokenSyntax,
-    colon: TokenSyntax,
+    colon: TokenSyntax = Tokens.`colon`,
     value: TokenSyntax,
     trailingComma: TokenSyntax? = nil
   ) {
@@ -5274,7 +5274,7 @@ public struct TargetFunctionEntry: SyntaxBuildable {
 
   public init(
     label: TokenSyntax,
-    colon: TokenSyntax,
+    colon: TokenSyntax = Tokens.`colon`,
     delcname: DeclName,
     trailingComma: TokenSyntax? = nil
   ) {
@@ -5318,7 +5318,7 @@ public struct NamedAttributeStringArgument: SyntaxBuildable {
 
   public init(
     nameTok: TokenSyntax,
-    colon: TokenSyntax,
+    colon: TokenSyntax = Tokens.`colon`,
     stringOrDeclname: SyntaxBuildable
   ) {
     self.nameTok = nameTok
@@ -5391,7 +5391,7 @@ public struct ImplementsAttributeArguments: SyntaxBuildable {
 
   public init(
     type: SimpleTypeIdentifier,
-    comma: TokenSyntax,
+    comma: TokenSyntax = Tokens.`comma`,
     declBaseName: SyntaxBuildable,
     declNameArguments: DeclNameArguments? = nil
   ) {
@@ -5545,7 +5545,7 @@ public struct DifferentiabilityParamsClause: SyntaxBuildable {
 
   public init(
     wrtLabel: TokenSyntax,
-    colon: TokenSyntax,
+    colon: TokenSyntax = Tokens.`colon`,
     parameters: SyntaxBuildable
   ) {
     self.wrtLabel = wrtLabel
@@ -5581,9 +5581,9 @@ public struct DifferentiabilityParams: SyntaxBuildable {
   let rightParen: TokenSyntax
 
   public init(
-    leftParen: TokenSyntax,
+    leftParen: TokenSyntax = Tokens.`leftParen`,
     diffParams: DifferentiabilityParamList,
-    rightParen: TokenSyntax
+    rightParen: TokenSyntax = Tokens.`rightParen`
   ) {
     self.leftParen = leftParen
     self.diffParams = diffParams
@@ -5691,7 +5691,7 @@ public struct DerivativeRegistrationAttributeArguments: SyntaxBuildable {
 
   public init(
     ofLabel: TokenSyntax,
-    colon: TokenSyntax,
+    colon: TokenSyntax = Tokens.`colon`,
     originalDeclName: QualifiedDeclName,
     period: TokenSyntax? = nil,
     accessorKind: TokenSyntax? = nil,
@@ -5814,7 +5814,7 @@ public struct ContinueStmt: StmtBuildable {
   let label: TokenSyntax?
 
   public init(
-    continueKeyword: TokenSyntax,
+    continueKeyword: TokenSyntax = Tokens.`continue`,
     label: TokenSyntax? = nil
   ) {
     self.continueKeyword = continueKeyword
@@ -5851,7 +5851,7 @@ public struct WhileStmt: StmtBuildable {
   public init(
     labelName: TokenSyntax? = nil,
     labelColon: TokenSyntax? = nil,
-    whileKeyword: TokenSyntax,
+    whileKeyword: TokenSyntax = Tokens.`while`,
     conditions: ConditionElementList,
     body: CodeBlock
   ) {
@@ -5890,7 +5890,7 @@ public struct DeferStmt: StmtBuildable {
   let body: CodeBlock
 
   public init(
-    deferKeyword: TokenSyntax,
+    deferKeyword: TokenSyntax = Tokens.`defer`,
     body: CodeBlock
   ) {
     self.deferKeyword = deferKeyword
@@ -5984,9 +5984,9 @@ public struct RepeatWhileStmt: StmtBuildable {
   public init(
     labelName: TokenSyntax? = nil,
     labelColon: TokenSyntax? = nil,
-    repeatKeyword: TokenSyntax,
+    repeatKeyword: TokenSyntax = Tokens.`repeat`,
     body: CodeBlock,
-    whileKeyword: TokenSyntax,
+    whileKeyword: TokenSyntax = Tokens.`while`,
     condition: ExprBuildable
   ) {
     self.labelName = labelName
@@ -6028,9 +6028,9 @@ public struct GuardStmt: StmtBuildable {
   let body: CodeBlock
 
   public init(
-    guardKeyword: TokenSyntax,
+    guardKeyword: TokenSyntax = Tokens.`guard`,
     conditions: ConditionElementList,
-    elseKeyword: TokenSyntax,
+    elseKeyword: TokenSyntax = Tokens.`else`,
     body: CodeBlock
   ) {
     self.guardKeyword = guardKeyword
@@ -6066,7 +6066,7 @@ public struct WhereClause: SyntaxBuildable {
   let guardResult: ExprBuildable
 
   public init(
-    whereKeyword: TokenSyntax,
+    whereKeyword: TokenSyntax = Tokens.`where`,
     guardResult: ExprBuildable
   ) {
     self.whereKeyword = whereKeyword
@@ -6110,13 +6110,13 @@ public struct ForInStmt: StmtBuildable {
   public init(
     labelName: TokenSyntax? = nil,
     labelColon: TokenSyntax? = nil,
-    forKeyword: TokenSyntax,
+    forKeyword: TokenSyntax = Tokens.`for`,
     tryKeyword: TokenSyntax? = nil,
     awaitKeyword: TokenSyntax? = nil,
     caseKeyword: TokenSyntax? = nil,
     pattern: PatternBuildable,
     typeAnnotation: TypeAnnotation? = nil,
-    inKeyword: TokenSyntax,
+    inKeyword: TokenSyntax = Tokens.`in`,
     sequenceExpr: ExprBuildable,
     whereClause: WhereClause? = nil,
     body: CodeBlock
@@ -6177,11 +6177,11 @@ public struct SwitchStmt: StmtBuildable {
   public init(
     labelName: TokenSyntax? = nil,
     labelColon: TokenSyntax? = nil,
-    switchKeyword: TokenSyntax,
+    switchKeyword: TokenSyntax = Tokens.`switch`,
     expression: ExprBuildable,
-    leftBrace: TokenSyntax,
+    leftBrace: TokenSyntax = Tokens.`leftBrace`,
     cases: SwitchCaseList,
-    rightBrace: TokenSyntax
+    rightBrace: TokenSyntax = Tokens.`rightBrace`
   ) {
     self.labelName = labelName
     self.labelColon = labelColon
@@ -6255,7 +6255,7 @@ public struct DoStmt: StmtBuildable {
   public init(
     labelName: TokenSyntax? = nil,
     labelColon: TokenSyntax? = nil,
-    doKeyword: TokenSyntax,
+    doKeyword: TokenSyntax = Tokens.`do`,
     body: CodeBlock,
     catchClauses: CatchClauseList? = nil
   ) {
@@ -6294,7 +6294,7 @@ public struct ReturnStmt: StmtBuildable {
   let expression: ExprBuildable?
 
   public init(
-    returnKeyword: TokenSyntax,
+    returnKeyword: TokenSyntax = Tokens.`return`,
     expression: ExprBuildable? = nil
   ) {
     self.returnKeyword = returnKeyword
@@ -6326,7 +6326,7 @@ public struct YieldStmt: StmtBuildable {
   let yields: SyntaxBuildable
 
   public init(
-    yieldKeyword: TokenSyntax,
+    yieldKeyword: TokenSyntax = Tokens.`yield`,
     yields: SyntaxBuildable
   ) {
     self.yieldKeyword = yieldKeyword
@@ -6360,10 +6360,10 @@ public struct YieldList: SyntaxBuildable {
   let rightParen: TokenSyntax
 
   public init(
-    leftParen: TokenSyntax,
+    leftParen: TokenSyntax = Tokens.`leftParen`,
     elementList: ExprList,
     trailingComma: TokenSyntax? = nil,
-    rightParen: TokenSyntax
+    rightParen: TokenSyntax = Tokens.`rightParen`
   ) {
     self.leftParen = leftParen
     self.elementList = elementList
@@ -6397,7 +6397,7 @@ public struct FallthroughStmt: StmtBuildable {
   let fallthroughKeyword: TokenSyntax
 
   public init(
-    fallthroughKeyword: TokenSyntax
+    fallthroughKeyword: TokenSyntax = Tokens.`fallthrough`
   ) {
     self.fallthroughKeyword = fallthroughKeyword
   }
@@ -6426,7 +6426,7 @@ public struct BreakStmt: StmtBuildable {
   let label: TokenSyntax?
 
   public init(
-    breakKeyword: TokenSyntax,
+    breakKeyword: TokenSyntax = Tokens.`break`,
     label: TokenSyntax? = nil
   ) {
     self.breakKeyword = breakKeyword
@@ -6548,10 +6548,10 @@ public struct AvailabilityCondition: SyntaxBuildable {
   let rightParen: TokenSyntax
 
   public init(
-    poundAvailableKeyword: TokenSyntax,
-    leftParen: TokenSyntax,
+    poundAvailableKeyword: TokenSyntax = Tokens.`poundAvailable`,
+    leftParen: TokenSyntax = Tokens.`leftParen`,
     availabilitySpec: AvailabilitySpecList,
-    rightParen: TokenSyntax
+    rightParen: TokenSyntax = Tokens.`rightParen`
   ) {
     self.poundAvailableKeyword = poundAvailableKeyword
     self.leftParen = leftParen
@@ -6588,7 +6588,7 @@ public struct MatchingPatternCondition: SyntaxBuildable {
   let initializer: InitializerClause
 
   public init(
-    caseKeyword: TokenSyntax,
+    caseKeyword: TokenSyntax = Tokens.`case`,
     pattern: PatternBuildable,
     typeAnnotation: TypeAnnotation? = nil,
     initializer: InitializerClause
@@ -6722,7 +6722,7 @@ public struct ThrowStmt: StmtBuildable {
   let expression: ExprBuildable
 
   public init(
-    throwKeyword: TokenSyntax,
+    throwKeyword: TokenSyntax = Tokens.`throw`,
     expression: ExprBuildable
   ) {
     self.throwKeyword = throwKeyword
@@ -6761,7 +6761,7 @@ public struct IfStmt: StmtBuildable {
   public init(
     labelName: TokenSyntax? = nil,
     labelColon: TokenSyntax? = nil,
-    ifKeyword: TokenSyntax,
+    ifKeyword: TokenSyntax = Tokens.`if`,
     conditions: ConditionElementList,
     body: CodeBlock,
     elseKeyword: TokenSyntax? = nil,
@@ -6834,7 +6834,7 @@ public struct ElseBlock: SyntaxBuildable {
   let body: CodeBlock
 
   public init(
-    elseKeyword: TokenSyntax,
+    elseKeyword: TokenSyntax = Tokens.`else`,
     body: CodeBlock
   ) {
     self.elseKeyword = elseKeyword
@@ -6902,8 +6902,8 @@ public struct SwitchDefaultLabel: SyntaxBuildable {
   let colon: TokenSyntax
 
   public init(
-    defaultKeyword: TokenSyntax,
-    colon: TokenSyntax
+    defaultKeyword: TokenSyntax = Tokens.`default`,
+    colon: TokenSyntax = Tokens.`colon`
   ) {
     self.defaultKeyword = defaultKeyword
     self.colon = colon
@@ -7007,9 +7007,9 @@ public struct SwitchCaseLabel: SyntaxBuildable {
   let colon: TokenSyntax
 
   public init(
-    caseKeyword: TokenSyntax,
+    caseKeyword: TokenSyntax = Tokens.`case`,
     caseItems: CaseItemList,
-    colon: TokenSyntax
+    colon: TokenSyntax = Tokens.`colon`
   ) {
     self.caseKeyword = caseKeyword
     self.caseItems = caseItems
@@ -7043,7 +7043,7 @@ public struct CatchClause: SyntaxBuildable {
   let body: CodeBlock
 
   public init(
-    catchKeyword: TokenSyntax,
+    catchKeyword: TokenSyntax = Tokens.`catch`,
     catchItems: CatchItemList? = nil,
     body: CodeBlock
   ) {
@@ -7082,12 +7082,12 @@ public struct PoundAssertStmt: StmtBuildable {
   let rightParen: TokenSyntax
 
   public init(
-    poundAssert: TokenSyntax,
-    leftParen: TokenSyntax,
+    poundAssert: TokenSyntax = Tokens.`poundAssert`,
+    leftParen: TokenSyntax = Tokens.`leftParen`,
     condition: ExprBuildable,
     comma: TokenSyntax? = nil,
     message: TokenSyntax? = nil,
-    rightParen: TokenSyntax
+    rightParen: TokenSyntax = Tokens.`rightParen`
   ) {
     self.poundAssert = poundAssert
     self.leftParen = leftParen
@@ -7126,7 +7126,7 @@ public struct GenericWhereClause: SyntaxBuildable {
   let requirementList: GenericRequirementList
 
   public init(
-    whereKeyword: TokenSyntax,
+    whereKeyword: TokenSyntax = Tokens.`where`,
     requirementList: GenericRequirementList
   ) {
     self.whereKeyword = whereKeyword
@@ -7327,9 +7327,9 @@ public struct GenericParameterClause: SyntaxBuildable {
   let rightAngleBracket: TokenSyntax
 
   public init(
-    leftAngleBracket: TokenSyntax,
+    leftAngleBracket: TokenSyntax = Tokens.`leftAngle`,
     genericParameterList: GenericParameterList,
-    rightAngleBracket: TokenSyntax
+    rightAngleBracket: TokenSyntax = Tokens.`rightAngle`
   ) {
     self.leftAngleBracket = leftAngleBracket
     self.genericParameterList = genericParameterList
@@ -7364,7 +7364,7 @@ public struct ConformanceRequirement: SyntaxBuildable {
 
   public init(
     leftTypeIdentifier: TypeBuildable,
-    colon: TokenSyntax,
+    colon: TokenSyntax = Tokens.`colon`,
     rightTypeIdentifier: TypeBuildable
   ) {
     self.leftTypeIdentifier = leftTypeIdentifier
@@ -7469,7 +7469,7 @@ public struct ClassRestrictionType: TypeBuildable {
   let classKeyword: TokenSyntax
 
   public init(
-    classKeyword: TokenSyntax
+    classKeyword: TokenSyntax = Tokens.`class`
   ) {
     self.classKeyword = classKeyword
   }
@@ -7499,9 +7499,9 @@ public struct ArrayType: TypeBuildable {
   let rightSquareBracket: TokenSyntax
 
   public init(
-    leftSquareBracket: TokenSyntax,
+    leftSquareBracket: TokenSyntax = Tokens.`leftSquareBracket`,
     elementType: TypeBuildable,
-    rightSquareBracket: TokenSyntax
+    rightSquareBracket: TokenSyntax = Tokens.`rightSquareBracket`
   ) {
     self.leftSquareBracket = leftSquareBracket
     self.elementType = elementType
@@ -7537,11 +7537,11 @@ public struct DictionaryType: TypeBuildable {
   let rightSquareBracket: TokenSyntax
 
   public init(
-    leftSquareBracket: TokenSyntax,
+    leftSquareBracket: TokenSyntax = Tokens.`leftSquareBracket`,
     keyType: TypeBuildable,
-    colon: TokenSyntax,
+    colon: TokenSyntax = Tokens.`colon`,
     valueType: TypeBuildable,
-    rightSquareBracket: TokenSyntax
+    rightSquareBracket: TokenSyntax = Tokens.`rightSquareBracket`
   ) {
     self.leftSquareBracket = leftSquareBracket
     self.keyType = keyType
@@ -7580,7 +7580,7 @@ public struct MetatypeType: TypeBuildable {
 
   public init(
     baseType: TypeBuildable,
-    period: TokenSyntax,
+    period: TokenSyntax = Tokens.`period`,
     typeOrProtocol: TokenSyntax
   ) {
     self.baseType = baseType
@@ -7615,7 +7615,7 @@ public struct OptionalType: TypeBuildable {
 
   public init(
     wrappedType: TypeBuildable,
-    questionMark: TokenSyntax
+    questionMark: TokenSyntax = Tokens.`postfixQuestionMark`
   ) {
     self.wrappedType = wrappedType
     self.questionMark = questionMark
@@ -7679,7 +7679,7 @@ public struct ImplicitlyUnwrappedOptionalType: TypeBuildable {
 
   public init(
     wrappedType: TypeBuildable,
-    exclamationMark: TokenSyntax
+    exclamationMark: TokenSyntax = Tokens.`exclamationMark`
   ) {
     self.wrappedType = wrappedType
     self.exclamationMark = exclamationMark
@@ -7883,9 +7883,9 @@ public struct TupleType: TypeBuildable {
   let rightParen: TokenSyntax
 
   public init(
-    leftParen: TokenSyntax,
+    leftParen: TokenSyntax = Tokens.`leftParen`,
     elements: TupleTypeElementList,
-    rightParen: TokenSyntax
+    rightParen: TokenSyntax = Tokens.`rightParen`
   ) {
     self.leftParen = leftParen
     self.elements = elements
@@ -7923,12 +7923,12 @@ public struct FunctionType: TypeBuildable {
   let returnType: TypeBuildable
 
   public init(
-    leftParen: TokenSyntax,
+    leftParen: TokenSyntax = Tokens.`leftParen`,
     arguments: TupleTypeElementList,
-    rightParen: TokenSyntax,
+    rightParen: TokenSyntax = Tokens.`rightParen`,
     asyncKeyword: TokenSyntax? = nil,
     throwsOrRethrowsKeyword: TokenSyntax? = nil,
-    arrow: TokenSyntax,
+    arrow: TokenSyntax = Tokens.`arrow`,
     returnType: TypeBuildable
   ) {
     self.leftParen = leftParen
@@ -8067,9 +8067,9 @@ public struct GenericArgumentClause: SyntaxBuildable {
   let rightAngleBracket: TokenSyntax
 
   public init(
-    leftAngleBracket: TokenSyntax,
+    leftAngleBracket: TokenSyntax = Tokens.`leftAngle`,
     arguments: GenericArgumentList,
-    rightAngleBracket: TokenSyntax
+    rightAngleBracket: TokenSyntax = Tokens.`rightAngle`
   ) {
     self.leftAngleBracket = leftAngleBracket
     self.arguments = arguments
@@ -8102,7 +8102,7 @@ public struct TypeAnnotation: SyntaxBuildable {
   let type: TypeBuildable
 
   public init(
-    colon: TokenSyntax,
+    colon: TokenSyntax = Tokens.`colon`,
     type: TypeBuildable
   ) {
     self.colon = colon
@@ -8137,7 +8137,7 @@ public struct EnumCasePattern: PatternBuildable {
 
   public init(
     type: TypeBuildable? = nil,
-    period: TokenSyntax,
+    period: TokenSyntax = Tokens.`period`,
     caseName: TokenSyntax,
     associatedTuple: TuplePattern? = nil
   ) {
@@ -8174,7 +8174,7 @@ public struct IsTypePattern: PatternBuildable {
   let type: TypeBuildable
 
   public init(
-    isKeyword: TokenSyntax,
+    isKeyword: TokenSyntax = Tokens.`is`,
     type: TypeBuildable
   ) {
     self.isKeyword = isKeyword
@@ -8207,7 +8207,7 @@ public struct OptionalPattern: PatternBuildable {
 
   public init(
     subPattern: PatternBuildable,
-    questionMark: TokenSyntax
+    questionMark: TokenSyntax = Tokens.`postfixQuestionMark`
   ) {
     self.subPattern = subPattern
     self.questionMark = questionMark
@@ -8268,7 +8268,7 @@ public struct AsTypePattern: PatternBuildable {
 
   public init(
     pattern: PatternBuildable,
-    asKeyword: TokenSyntax,
+    asKeyword: TokenSyntax = Tokens.`as`,
     type: TypeBuildable
   ) {
     self.pattern = pattern
@@ -8303,9 +8303,9 @@ public struct TuplePattern: PatternBuildable {
   let rightParen: TokenSyntax
 
   public init(
-    leftParen: TokenSyntax,
+    leftParen: TokenSyntax = Tokens.`leftParen`,
     elements: TuplePatternElementList,
-    rightParen: TokenSyntax
+    rightParen: TokenSyntax = Tokens.`rightParen`
   ) {
     self.leftParen = leftParen
     self.elements = elements
@@ -8338,7 +8338,7 @@ public struct WildcardPattern: PatternBuildable {
   let typeAnnotation: TypeAnnotation?
 
   public init(
-    wildcard: TokenSyntax,
+    wildcard: TokenSyntax = Tokens.`wildcard`,
     typeAnnotation: TypeAnnotation? = nil
   ) {
     self.wildcard = wildcard
@@ -8568,7 +8568,7 @@ public struct AvailabilityLabeledArgument: SyntaxBuildable {
 
   public init(
     label: TokenSyntax,
-    colon: TokenSyntax,
+    colon: TokenSyntax = Tokens.`colon`,
     value: SyntaxBuildable
   ) {
     self.label = label
diff --git a/Sources/SwiftSyntaxBuilder/gyb_generated/BuildablesConvenienceInitializers.swift b/Sources/SwiftSyntaxBuilder/gyb_generated/BuildablesConvenienceInitializers.swift
index 82ecd216ada..3cd2a79d46a 100644
--- a/Sources/SwiftSyntaxBuilder/gyb_generated/BuildablesConvenienceInitializers.swift
+++ b/Sources/SwiftSyntaxBuilder/gyb_generated/BuildablesConvenienceInitializers.swift
@@ -1,4 +1,4 @@
-//// Automatically Generated From DeclBuildables.swift.gyb.
+//// Automatically Generated From BuildablesConvenienceInitializers.swift.gyb.
 //// Do Not Edit Directly!
 //===----------------------------------------------------------------------===//
 //
@@ -28,6 +28,18 @@ extension CodeBlock {
   }
 }
 
+extension AwaitExpr {
+  public init(
+    awaitKeyword: String,
+    expression: ExprBuildable
+  ) {
+    self.init(
+      awaitKeyword: SyntaxFactory.makeIdentifier(awaitKeyword),
+      expression: expression
+    )
+  }
+}
+
 extension DeclNameArguments {
   public init(
     leftParen: TokenSyntax = Tokens.`leftParen`,
@@ -52,6 +64,54 @@ extension SequenceExpr {
   }
 }
 
+extension SymbolicReferenceExpr {
+  public init(
+    identifier: String,
+    genericArgumentClause: GenericArgumentClause? = nil
+  ) {
+    self.init(
+      identifier: SyntaxFactory.makeIdentifier(identifier),
+      genericArgumentClause: genericArgumentClause
+    )
+  }
+}
+
+extension PrefixOperatorExpr {
+  public init(
+    operatorToken: String?,
+    postfixExpression: ExprBuildable
+  ) {
+    self.init(
+      operatorToken: operatorToken.map(Tokens.prefixOperator),
+      postfixExpression: postfixExpression
+    )
+  }
+}
+
+extension ArrowExpr {
+  public init(
+    asyncKeyword: String?,
+    throwsToken: TokenSyntax? = nil,
+    arrowToken: TokenSyntax = Tokens.`arrow`
+  ) {
+    self.init(
+      asyncKeyword: asyncKeyword.map({ SyntaxFactory.makeIdentifier($0) }),
+      throwsToken: throwsToken,
+      arrowToken: arrowToken
+    )
+  }
+}
+
+extension FloatLiteralExpr {
+  public init(
+    floatingDigits: String
+  ) {
+    self.init(
+      floatingDigits: Tokens.floatingLiteral(floatingDigits)
+    )
+  }
+}
+
 extension TupleExpr {
   public init(
     leftParen: TokenSyntax = Tokens.`leftParen`,
@@ -80,6 +140,16 @@ extension ArrayExpr {
   }
 }
 
+extension IntegerLiteralExpr {
+  public init(
+    digits: String
+  ) {
+    self.init(
+      digits: Tokens.integerLiteral(digits)
+    )
+  }
+}
+
 extension ClosureCaptureItem {
   public init(
     @TokenListBuilder specifierBuilder: () -> TokenList? = { nil },
@@ -190,6 +260,28 @@ extension SubscriptExpr {
   }
 }
 
+extension PostfixUnaryExpr {
+  public init(
+    expression: ExprBuildable,
+    operatorToken: String
+  ) {
+    self.init(
+      expression: expression,
+      operatorToken: Tokens.postfixOperator(operatorToken)
+    )
+  }
+}
+
+extension StringSegment {
+  public init(
+    content: String
+  ) {
+    self.init(
+      content: Tokens.stringSegment(content)
+    )
+  }
+}
+
 extension ExpressionSegment {
   public init(
     backslash: TokenSyntax = Tokens.`backslash`,
@@ -226,6 +318,18 @@ extension StringLiteralExpr {
   }
 }
 
+extension ObjcNamePiece {
+  public init(
+    name: String,
+    dot: TokenSyntax? = nil
+  ) {
+    self.init(
+      name: SyntaxFactory.makeIdentifier(name),
+      dot: dot
+    )
+  }
+}
+
 extension ObjcKeyPathExpr {
   public init(
     keyPath: TokenSyntax = Tokens.`poundKeyPath`,
@@ -242,6 +346,36 @@ extension ObjcKeyPathExpr {
   }
 }
 
+extension ObjcSelectorExpr {
+  public init(
+    poundSelector: TokenSyntax = Tokens.`poundSelector`,
+    leftParen: TokenSyntax = Tokens.`leftParen`,
+    kind: String?,
+    colon: TokenSyntax? = nil,
+    name: ExprBuildable,
+    rightParen: TokenSyntax = Tokens.`rightParen`
+  ) {
+    self.init(
+      poundSelector: poundSelector,
+      leftParen: leftParen,
+      kind: kind.map(Tokens.contextualKeyword),
+      colon: colon,
+      name: name,
+      rightParen: rightParen
+    )
+  }
+}
+
+extension EditorPlaceholderExpr {
+  public init(
+    identifier: String
+  ) {
+    self.init(
+      identifier: SyntaxFactory.makeIdentifier(identifier)
+    )
+  }
+}
+
 extension ObjectLiteralExpr {
   public init(
     identifier: TokenSyntax,
@@ -316,6 +450,22 @@ extension ParameterClause {
   }
 }
 
+extension FunctionSignature {
+  public init(
+    input: ParameterClause,
+    asyncOrReasyncKeyword: String?,
+    throwsOrRethrowsKeyword: TokenSyntax? = nil,
+    output: ReturnClause? = nil
+  ) {
+    self.init(
+      input: input,
+      asyncOrReasyncKeyword: asyncOrReasyncKeyword.map({ SyntaxFactory.makeIdentifier($0) }),
+      throwsOrRethrowsKeyword: throwsOrRethrowsKeyword,
+      output: output
+    )
+  }
+}
+
 extension IfConfigDecl {
   public init(
     @IfConfigClauseListBuilder clausesBuilder: () -> IfConfigClauseList = { .empty },
@@ -328,6 +478,44 @@ extension IfConfigDecl {
   }
 }
 
+extension PoundSourceLocationArgs {
+  public init(
+    fileArgLabel: String,
+    fileArgColon: TokenSyntax = Tokens.`colon`,
+    fileName: String,
+    comma: TokenSyntax = Tokens.`comma`,
+    lineArgLabel: String,
+    lineArgColon: TokenSyntax = Tokens.`colon`,
+    lineNumber: String
+  ) {
+    self.init(
+      fileArgLabel: SyntaxFactory.makeIdentifier(fileArgLabel),
+      fileArgColon: fileArgColon,
+      fileName: Tokens.stringLiteral(fileName),
+      comma: comma,
+      lineArgLabel: SyntaxFactory.makeIdentifier(lineArgLabel),
+      lineArgColon: lineArgColon,
+      lineNumber: Tokens.integerLiteral(lineNumber)
+    )
+  }
+}
+
+extension DeclModifier {
+  public init(
+    name: TokenSyntax,
+    detailLeftParen: TokenSyntax? = nil,
+    detail: String?,
+    detailRightParen: TokenSyntax? = nil
+  ) {
+    self.init(
+      name: name,
+      detailLeftParen: detailLeftParen,
+      detail: detail.map({ SyntaxFactory.makeIdentifier($0) }),
+      detailRightParen: detailRightParen
+    )
+  }
+}
+
 extension TypeInheritanceClause {
   public init(
     colon: TokenSyntax = Tokens.`colon`,
@@ -572,6 +760,34 @@ extension SubscriptDecl {
   }
 }
 
+extension AccessLevelModifier {
+  public init(
+    name: String,
+    leftParen: TokenSyntax? = nil,
+    modifier: String?,
+    rightParen: TokenSyntax? = nil
+  ) {
+    self.init(
+      name: SyntaxFactory.makeIdentifier(name),
+      leftParen: leftParen,
+      modifier: modifier.map({ SyntaxFactory.makeIdentifier($0) }),
+      rightParen: rightParen
+    )
+  }
+}
+
+extension AccessPathComponent {
+  public init(
+    name: String,
+    trailingDot: TokenSyntax? = nil
+  ) {
+    self.init(
+      name: SyntaxFactory.makeIdentifier(name),
+      trailingDot: trailingDot
+    )
+  }
+}
+
 extension ImportDecl {
   public init(
     @AttributeListBuilder attributesBuilder: () -> AttributeList? = { nil },
@@ -590,6 +806,20 @@ extension ImportDecl {
   }
 }
 
+extension AccessorParameter {
+  public init(
+    leftParen: TokenSyntax = Tokens.`leftParen`,
+    name: String,
+    rightParen: TokenSyntax = Tokens.`rightParen`
+  ) {
+    self.init(
+      leftParen: leftParen,
+      name: SyntaxFactory.makeIdentifier(name),
+      rightParen: rightParen
+    )
+  }
+}
+
 extension AccessorDecl {
   public init(
     @AttributeListBuilder attributesBuilder: () -> AttributeList? = { nil },
@@ -642,6 +872,22 @@ extension VariableDecl {
   }
 }
 
+extension EnumCaseElement {
+  public init(
+    identifier: String,
+    associatedValue: ParameterClause? = nil,
+    rawValue: InitializerClause? = nil,
+    trailingComma: TokenSyntax? = nil
+  ) {
+    self.init(
+      identifier: SyntaxFactory.makeIdentifier(identifier),
+      associatedValue: associatedValue,
+      rawValue: rawValue,
+      trailingComma: trailingComma
+    )
+  }
+}
+
 extension EnumCaseDecl {
   public init(
     @AttributeListBuilder attributesBuilder: () -> AttributeList? = { nil },
@@ -748,6 +994,46 @@ extension PrecedenceGroupRelation {
   }
 }
 
+extension PrecedenceGroupNameElement {
+  public init(
+    name: String,
+    trailingComma: TokenSyntax? = nil
+  ) {
+    self.init(
+      name: SyntaxFactory.makeIdentifier(name),
+      trailingComma: trailingComma
+    )
+  }
+}
+
+extension PrecedenceGroupAssignment {
+  public init(
+    assignmentKeyword: String,
+    colon: TokenSyntax = Tokens.`colon`,
+    flag: TokenSyntax
+  ) {
+    self.init(
+      assignmentKeyword: SyntaxFactory.makeIdentifier(assignmentKeyword),
+      colon: colon,
+      flag: flag
+    )
+  }
+}
+
+extension PrecedenceGroupAssociativity {
+  public init(
+    associativityKeyword: String,
+    colon: TokenSyntax = Tokens.`colon`,
+    value: String
+  ) {
+    self.init(
+      associativityKeyword: SyntaxFactory.makeIdentifier(associativityKeyword),
+      colon: colon,
+      value: SyntaxFactory.makeIdentifier(value)
+    )
+  }
+}
+
 extension CustomAttribute {
   public init(
     atSignToken: TokenSyntax = Tokens.`atSign`,
@@ -786,6 +1072,82 @@ extension Attribute {
   }
 }
 
+extension LabeledSpecializeEntry {
+  public init(
+    label: String,
+    colon: TokenSyntax = Tokens.`colon`,
+    value: TokenSyntax,
+    trailingComma: TokenSyntax? = nil
+  ) {
+    self.init(
+      label: SyntaxFactory.makeIdentifier(label),
+      colon: colon,
+      value: value,
+      trailingComma: trailingComma
+    )
+  }
+}
+
+extension TargetFunctionEntry {
+  public init(
+    label: String,
+    colon: TokenSyntax = Tokens.`colon`,
+    delcname: DeclName,
+    trailingComma: TokenSyntax? = nil
+  ) {
+    self.init(
+      label: SyntaxFactory.makeIdentifier(label),
+      colon: colon,
+      delcname: delcname,
+      trailingComma: trailingComma
+    )
+  }
+}
+
+extension ObjCSelectorPiece {
+  public init(
+    name: String?,
+    colon: TokenSyntax? = nil
+  ) {
+    self.init(
+      name: name.map({ SyntaxFactory.makeIdentifier($0) }),
+      colon: colon
+    )
+  }
+}
+
+extension DifferentiableAttributeArguments {
+  public init(
+    diffKind: String?,
+    diffKindComma: TokenSyntax? = nil,
+    diffParams: DifferentiabilityParamsClause? = nil,
+    diffParamsComma: TokenSyntax? = nil,
+    whereClause: GenericWhereClause? = nil
+  ) {
+    self.init(
+      diffKind: diffKind.map({ SyntaxFactory.makeIdentifier($0) }),
+      diffKindComma: diffKindComma,
+      diffParams: diffParams,
+      diffParamsComma: diffParamsComma,
+      whereClause: whereClause
+    )
+  }
+}
+
+extension DifferentiabilityParamsClause {
+  public init(
+    wrtLabel: String,
+    colon: TokenSyntax = Tokens.`colon`,
+    parameters: SyntaxBuildable
+  ) {
+    self.init(
+      wrtLabel: SyntaxFactory.makeIdentifier(wrtLabel),
+      colon: colon,
+      parameters: parameters
+    )
+  }
+}
+
 extension DifferentiabilityParams {
   public init(
     leftParen: TokenSyntax = Tokens.`leftParen`,
@@ -800,6 +1162,40 @@ extension DifferentiabilityParams {
   }
 }
 
+extension DerivativeRegistrationAttributeArguments {
+  public init(
+    ofLabel: String,
+    colon: TokenSyntax = Tokens.`colon`,
+    originalDeclName: QualifiedDeclName,
+    period: TokenSyntax? = nil,
+    accessorKind: String?,
+    comma: TokenSyntax? = nil,
+    diffParams: DifferentiabilityParamsClause? = nil
+  ) {
+    self.init(
+      ofLabel: SyntaxFactory.makeIdentifier(ofLabel),
+      colon: colon,
+      originalDeclName: originalDeclName,
+      period: period,
+      accessorKind: accessorKind.map({ SyntaxFactory.makeIdentifier($0) }),
+      comma: comma,
+      diffParams: diffParams
+    )
+  }
+}
+
+extension ContinueStmt {
+  public init(
+    continueKeyword: TokenSyntax = Tokens.`continue`,
+    label: String?
+  ) {
+    self.init(
+      continueKeyword: continueKeyword,
+      label: label.map({ SyntaxFactory.makeIdentifier($0) })
+    )
+  }
+}
+
 extension WhileStmt {
   public init(
     labelName: String?,
@@ -818,6 +1214,26 @@ extension WhileStmt {
   }
 }
 
+extension RepeatWhileStmt {
+  public init(
+    labelName: String?,
+    labelColon: TokenSyntax? = nil,
+    repeatKeyword: TokenSyntax = Tokens.`repeat`,
+    body: CodeBlock,
+    whileKeyword: TokenSyntax = Tokens.`while`,
+    condition: ExprBuildable
+  ) {
+    self.init(
+      labelName: labelName.map({ SyntaxFactory.makeIdentifier($0) }),
+      labelColon: labelColon,
+      repeatKeyword: repeatKeyword,
+      body: body,
+      whileKeyword: whileKeyword,
+      condition: condition
+    )
+  }
+}
+
 extension GuardStmt {
   public init(
     guardKeyword: TokenSyntax = Tokens.`guard`,
@@ -834,6 +1250,38 @@ extension GuardStmt {
   }
 }
 
+extension ForInStmt {
+  public init(
+    labelName: String?,
+    labelColon: TokenSyntax? = nil,
+    forKeyword: TokenSyntax = Tokens.`for`,
+    tryKeyword: TokenSyntax? = nil,
+    awaitKeyword: String?,
+    caseKeyword: TokenSyntax? = nil,
+    pattern: PatternBuildable,
+    typeAnnotation: TypeAnnotation? = nil,
+    inKeyword: TokenSyntax = Tokens.`in`,
+    sequenceExpr: ExprBuildable,
+    whereClause: WhereClause? = nil,
+    body: CodeBlock
+  ) {
+    self.init(
+      labelName: labelName.map({ SyntaxFactory.makeIdentifier($0) }),
+      labelColon: labelColon,
+      forKeyword: forKeyword,
+      tryKeyword: tryKeyword,
+      awaitKeyword: awaitKeyword.map({ SyntaxFactory.makeIdentifier($0) }),
+      caseKeyword: caseKeyword,
+      pattern: pattern,
+      typeAnnotation: typeAnnotation,
+      inKeyword: inKeyword,
+      sequenceExpr: sequenceExpr,
+      whereClause: whereClause,
+      body: body
+    )
+  }
+}
+
 extension SwitchStmt {
   public init(
     labelName: String?,
@@ -890,6 +1338,18 @@ extension YieldList {
   }
 }
 
+extension BreakStmt {
+  public init(
+    breakKeyword: TokenSyntax = Tokens.`break`,
+    label: String?
+  ) {
+    self.init(
+      breakKeyword: breakKeyword,
+      label: label.map({ SyntaxFactory.makeIdentifier($0) })
+    )
+  }
+}
+
 extension AvailabilityCondition {
   public init(
     poundAvailableKeyword: TokenSyntax = Tokens.`poundAvailable`,
@@ -970,6 +1430,26 @@ extension CatchClause {
   }
 }
 
+extension PoundAssertStmt {
+  public init(
+    poundAssert: TokenSyntax = Tokens.`poundAssert`,
+    leftParen: TokenSyntax = Tokens.`leftParen`,
+    condition: ExprBuildable,
+    comma: TokenSyntax? = nil,
+    message: String?,
+    rightParen: TokenSyntax = Tokens.`rightParen`
+  ) {
+    self.init(
+      poundAssert: poundAssert,
+      leftParen: leftParen,
+      condition: condition,
+      comma: comma,
+      message: message.map(Tokens.stringLiteral),
+      rightParen: rightParen
+    )
+  }
+}
+
 extension GenericWhereClause {
   public init(
     whereKeyword: TokenSyntax = Tokens.`where`,
@@ -1014,6 +1494,32 @@ extension GenericParameterClause {
   }
 }
 
+extension MetatypeType {
+  public init(
+    baseType: TypeBuildable,
+    period: TokenSyntax = Tokens.`period`,
+    typeOrProtocol: String
+  ) {
+    self.init(
+      baseType: baseType,
+      period: period,
+      typeOrProtocol: SyntaxFactory.makeIdentifier(typeOrProtocol)
+    )
+  }
+}
+
+extension SomeType {
+  public init(
+    someSpecifier: String,
+    baseType: TypeBuildable
+  ) {
+    self.init(
+      someSpecifier: SyntaxFactory.makeIdentifier(someSpecifier),
+      baseType: baseType
+    )
+  }
+}
+
 extension CompositionType {
   public init(
     @CompositionTypeElementListBuilder elementsBuilder: () -> CompositionTypeElementList = { .empty }
@@ -1088,6 +1594,22 @@ extension GenericArgumentClause {
   }
 }
 
+extension EnumCasePattern {
+  public init(
+    type: TypeBuildable? = nil,
+    period: TokenSyntax = Tokens.`period`,
+    caseName: String,
+    associatedTuple: TuplePattern? = nil
+  ) {
+    self.init(
+      type: type,
+      period: period,
+      caseName: SyntaxFactory.makeIdentifier(caseName),
+      associatedTuple: associatedTuple
+    )
+  }
+}
+
 extension TuplePattern {
   public init(
     leftParen: TokenSyntax = Tokens.`leftParen`,
@@ -1102,3 +1624,59 @@ extension TuplePattern {
   }
 }
 
+extension TuplePatternElement {
+  public init(
+    labelName: String?,
+    labelColon: TokenSyntax? = nil,
+    pattern: PatternBuildable,
+    trailingComma: TokenSyntax? = nil
+  ) {
+    self.init(
+      labelName: labelName.map({ SyntaxFactory.makeIdentifier($0) }),
+      labelColon: labelColon,
+      pattern: pattern,
+      trailingComma: trailingComma
+    )
+  }
+}
+
+extension AvailabilityLabeledArgument {
+  public init(
+    label: String,
+    colon: TokenSyntax = Tokens.`colon`,
+    value: SyntaxBuildable
+  ) {
+    self.init(
+      label: SyntaxFactory.makeIdentifier(label),
+      colon: colon,
+      value: value
+    )
+  }
+}
+
+extension AvailabilityVersionRestriction {
+  public init(
+    platform: String,
+    version: VersionTuple? = nil
+  ) {
+    self.init(
+      platform: SyntaxFactory.makeIdentifier(platform),
+      version: version
+    )
+  }
+}
+
+extension VersionTuple {
+  public init(
+    majorMinor: SyntaxBuildable,
+    patchPeriod: TokenSyntax? = nil,
+    patchVersion: String?
+  ) {
+    self.init(
+      majorMinor: majorMinor,
+      patchPeriod: patchPeriod,
+      patchVersion: patchVersion.map(Tokens.integerLiteral)
+    )
+  }
+}
+
diff --git a/Tests/SwiftSyntaxBuilderTest/BooleanLiteralTests.swift b/Tests/SwiftSyntaxBuilderTest/BooleanLiteralTests.swift
new file mode 100644
index 00000000000..7f560ba1cf7
--- /dev/null
+++ b/Tests/SwiftSyntaxBuilderTest/BooleanLiteralTests.swift
@@ -0,0 +1,25 @@
+import XCTest
+import SwiftSyntax
+
+import SwiftSyntaxBuilder
+
+final class BooleanLiteralTests: XCTestCase {
+  func testBooleanLiteral() {
+    let leadingTrivia = Trivia.garbageText("␣")
+
+    let testCases: [UInt: (BooleanLiteralExpr, String)] = [
+      #line: (BooleanLiteralExpr(booleanLiteral: Tokens.true), "␣true "),
+      #line: (BooleanLiteralExpr(booleanLiteral: Tokens.false), "␣false ")
+    ]
+
+    for (line, testCase) in testCases {
+      let (builder, expected) = testCase
+      let syntax = builder.buildSyntax(format: Format(), leadingTrivia: leadingTrivia)
+
+      var text = ""
+      syntax.write(to: &text)
+
+      XCTAssertEqual(text, expected, line: line)
+    }
+  }
+}
diff --git a/Tests/SwiftSyntaxBuilderTest/EnumCaseElementTests.swift b/Tests/SwiftSyntaxBuilderTest/EnumCaseElementTests.swift
index 12b7b72a35b..b770f2d9f6d 100644
--- a/Tests/SwiftSyntaxBuilderTest/EnumCaseElementTests.swift
+++ b/Tests/SwiftSyntaxBuilderTest/EnumCaseElementTests.swift
@@ -13,8 +13,7 @@ final class EnumCaseElementTests: XCTestCase {
                                                              segments: segments,
                                                              closeQuote: Tokens.stringQuote)
 
-    let initializerClause = InitializerClause(equal: Tokens.equal,
-                                              value: stringLiteralExpr)
+    let initializerClause = InitializerClause(value: stringLiteralExpr)
 
     let enumCase = EnumCaseElement(identifier: SyntaxFactory.makeIdentifier("TestEnum"),
                                    rawValue: initializerClause)
diff --git a/Tests/SwiftSyntaxBuilderTest/FloatLiteralTests.swift b/Tests/SwiftSyntaxBuilderTest/FloatLiteralTests.swift
new file mode 100644
index 00000000000..e279d9c9f7e
--- /dev/null
+++ b/Tests/SwiftSyntaxBuilderTest/FloatLiteralTests.swift
@@ -0,0 +1,27 @@
+import XCTest
+import SwiftSyntax
+
+import SwiftSyntaxBuilder
+
+final class FloatLiteralTests: XCTestCase {
+  func testFloatLiteral() {
+    let leadingTrivia = Trivia.garbageText("␣")
+
+    let testCases: [UInt: (FloatLiteralExpr, String)] = [
+      #line: (FloatLiteralExpr(floatingDigits: Tokens.floatingLiteral(String(123.321))), "␣123.321"),
+      #line: (FloatLiteralExpr(floatingDigits: Tokens.floatingLiteral(String(-123.321))), "␣-123.321"),
+      #line: (FloatLiteralExpr(floatingDigits: "2_123.321"), "␣2_123.321"),
+      #line: (FloatLiteralExpr(floatingDigits: "-2_123.321"), "␣-2_123.321")
+    ]
+
+    for (line, testCase) in testCases {
+      let (builder, expected) = testCase
+      let syntax = builder.buildSyntax(format: Format(), leadingTrivia: leadingTrivia)
+
+      var text = ""
+      syntax.write(to: &text)
+
+      XCTAssertEqual(text, expected, line: line)
+    }
+  }
+}
diff --git a/Tests/SwiftSyntaxBuilderTest/ImportTests.swift b/Tests/SwiftSyntaxBuilderTest/ImportTests.swift
index 3c23370924c..4f9e2a87384 100644
--- a/Tests/SwiftSyntaxBuilderTest/ImportTests.swift
+++ b/Tests/SwiftSyntaxBuilderTest/ImportTests.swift
@@ -8,8 +8,7 @@ final class ImportTests: XCTestCase {
     let leadingTrivia = Trivia.garbageText("␣")
     let identifier = SyntaxFactory.makeIdentifier("SwiftSyntax")
 
-    let importDecl = ImportDecl(importTok: Tokens.import,
-                                path: AccessPath([AccessPathComponent(name: identifier)]))
+    let importDecl = ImportDecl(path: AccessPath([AccessPathComponent(name: identifier)]))
 
     let syntax = importDecl.buildDecl(format: Format(), leadingTrivia: leadingTrivia)
 
diff --git a/Tests/SwiftSyntaxBuilderTest/IntegerLiteralTests.swift b/Tests/SwiftSyntaxBuilderTest/IntegerLiteralTests.swift
index 9b379b6e7c0..c78221eb8a9 100644
--- a/Tests/SwiftSyntaxBuilderTest/IntegerLiteralTests.swift
+++ b/Tests/SwiftSyntaxBuilderTest/IntegerLiteralTests.swift
@@ -8,8 +8,10 @@ final class IntegerLiteralTests: XCTestCase {
     let leadingTrivia = Trivia.garbageText("␣")
 
     let testCases: [UInt: (IntegerLiteralExpr, String)] = [
-      #line: (IntegerLiteralExpr(digits: SyntaxFactory.makeIntegerLiteral(String(123))), "␣123"),
-      #line: (IntegerLiteralExpr(digits: SyntaxFactory.makeIntegerLiteral(String(-123))), "␣-123"),
+      #line: (IntegerLiteralExpr(digits: Tokens.integerLiteral(String(123))), "␣123"),
+      #line: (IntegerLiteralExpr(digits: Tokens.integerLiteral(String(-123))), "␣-123"),
+      #line: (IntegerLiteralExpr(digits: "1_000"), "␣1_000"),
+      #line: (IntegerLiteralExpr(digits: "-1_000"), "␣-1_000")
     ]
 
     for (line, testCase) in testCases {
diff --git a/Tests/SwiftSyntaxBuilderTest/StructTests.swift b/Tests/SwiftSyntaxBuilderTest/StructTests.swift
index b688810b83b..cfc3fc350c7 100644
--- a/Tests/SwiftSyntaxBuilderTest/StructTests.swift
+++ b/Tests/SwiftSyntaxBuilderTest/StructTests.swift
@@ -6,11 +6,8 @@ import SwiftSyntaxBuilder
 final class StructTests: XCTestCase {
   func testEmptyStruct() {
     let leadingTrivia = Trivia.garbageText("␣")
-    let members = MemberDeclBlock(leftBrace: Tokens.leftBrace.withLeadingTrivia(.spaces(1)),
-                                  members: MemberDeclList([]),
-                                  rightBrace: Tokens.rightBrace)
-    let buildable = StructDecl(structKeyword: Tokens.struct,
-                               identifier: SyntaxFactory.makeIdentifier("TestStruct"),
+    let members = MemberDeclBlock(members: MemberDeclList([]))
+    let buildable = StructDecl(identifier: "TestStruct",
                                members: members)
     let syntax = buildable.buildSyntax(format: Format(), leadingTrivia: leadingTrivia)
 
@@ -18,64 +15,24 @@ final class StructTests: XCTestCase {
     syntax.write(to: &text)
 
     XCTAssertEqual(text, """
-    ␣struct TestStruct {
+    ␣struct TestStruct{
     }
     """)
   }
 
   func testNestedStruct() {
     let leadingTrivia = Trivia.garbageText("␣")
-    let emptyMembers = MemberDeclBlock(leftBrace: Tokens.leftBrace.withLeadingTrivia(.spaces(1)),
-                                  members: MemberDeclList([]),
-                                  rightBrace: Tokens.rightBrace)
-    let nestedStruct = StructDecl(structKeyword: Tokens.struct,
-                               identifier: SyntaxFactory.makeIdentifier("NestedStruct"),
-                               members: emptyMembers)
-    let members = MemberDeclBlock(leftBrace: Tokens.leftBrace.withLeadingTrivia(.spaces(1)),
-                                  members: MemberDeclList([MemberDeclListItem(decl: nestedStruct)]),
-                                  rightBrace: Tokens.rightBrace)
-    let testStruct = StructDecl(structKeyword: Tokens.struct,
-                                identifier: SyntaxFactory.makeIdentifier("TestStruct"),
+    let emptyMembers = MemberDeclBlock(members: MemberDeclList([]))
+    let nestedStruct = StructDecl(identifier: "NestedStruct",
+                                  members: emptyMembers)
+    let members = MemberDeclBlock(members: MemberDeclList([MemberDeclListItem(decl: nestedStruct)]))
+    let testStruct = StructDecl(identifier: "TestStruct",
                                 members: members)
     let syntax = testStruct.buildSyntax(format: Format(), leadingTrivia: leadingTrivia)
 
     var text = ""
     syntax.write(to: &text)
 
-    XCTAssertEqual(text, """
-    ␣struct TestStruct {
-        struct NestedStruct {
-        }
-    }
-    """)
-  }
-
-  func testEmptyStructWithBuilder() {
-    let leadingTrivia = Trivia.garbageText("␣")
-    let test = StructDecl(identifier: "TestStruct", members: MemberDeclBlock())
-
-    let syntax = test.buildSyntax(format: Format(), leadingTrivia: leadingTrivia)
-
-    var text = ""
-    syntax.write(to: &text)
-
-    XCTAssertEqual(text, """
-    ␣struct TestStruct{
-    }
-    """)
-  }
-
-  func testNestedStructWithBuilder() {
-    let leadingTrivia = Trivia.garbageText("␣")
-    let memberDeclBlock = MemberDeclBlock {
-      MemberDeclListItem(decl: StructDecl(identifier: "NestedStruct", members: MemberDeclBlock()))
-    }
-    let test = StructDecl(identifier: "TestStruct", members: memberDeclBlock)
-    let syntax = test.buildSyntax(format: Format(), leadingTrivia: leadingTrivia)
-
-    var text = ""
-    syntax.write(to: &text)
-
     XCTAssertEqual(text, """
     ␣struct TestStruct{
         struct NestedStruct{
diff --git a/Tests/SwiftSyntaxBuilderTest/VariableTests.swift b/Tests/SwiftSyntaxBuilderTest/VariableTests.swift
index cf6a67b670f..dfbe84c1e64 100644
--- a/Tests/SwiftSyntaxBuilderTest/VariableTests.swift
+++ b/Tests/SwiftSyntaxBuilderTest/VariableTests.swift
@@ -9,7 +9,7 @@ final class VariableTests: XCTestCase {
 
     let buildable = VariableDecl(letOrVarKeyword: Tokens.let) {
         PatternBinding(pattern: IdentifierPattern(identifier: SyntaxFactory.makeIdentifier("color")),
-                       typeAnnotation: TypeAnnotation(colon: Tokens.colon, type: SimpleTypeIdentifier("UIColor")))
+                       typeAnnotation: TypeAnnotation(type: SimpleTypeIdentifier("UIColor")))
     }
 
     let syntax = buildable.buildSyntax(format: Format(), leadingTrivia: leadingTrivia)
@@ -27,8 +27,8 @@ final class VariableTests: XCTestCase {
 
     let buildable = VariableDecl(letOrVarKeyword: Tokens.var) {
         PatternBinding(pattern: IdentifierPattern(identifier: SyntaxFactory.makeIdentifier("number")),
-                       typeAnnotation: TypeAnnotation(colon: Tokens.colon, type: SimpleTypeIdentifier("Int")),
-                       initializer: InitializerClause(equal: Tokens.equal, value: IntegerLiteralExpr(digits: Tokens.integerLiteral("123"))))
+                       typeAnnotation: TypeAnnotation(type: SimpleTypeIdentifier("Int")),
+                       initializer: InitializerClause(value: IntegerLiteralExpr(digits: Tokens.integerLiteral("123"))))
     }
 
     let syntax = buildable.buildSyntax(format: Format(), leadingTrivia: leadingTrivia)