diff --git a/utils/gyb_syntax_support/ExprNodes.py b/utils/gyb_syntax_support/ExprNodes.py
index e932421b9007b..8be812735fc7e 100644
--- a/utils/gyb_syntax_support/ExprNodes.py
+++ b/utils/gyb_syntax_support/ExprNodes.py
@@ -406,8 +406,9 @@
              Child('LeftBrace', kind='LeftBraceToken'),
              Child('Signature', kind='ClosureSignature', is_optional=True),
              Child('Statements', kind='CodeBlockItemList',
-                   collection_element_name='Statement'),
-             Child('RightBrace', kind='RightBraceToken'),
+                   collection_element_name='Statement', is_indented=True),
+             Child('RightBrace', kind='RightBraceToken',
+                   requires_leading_newline=True),
          ]),
 
     # unresolved-pattern-expr -> pattern
diff --git a/utils/gyb_syntax_support/StmtNodes.py b/utils/gyb_syntax_support/StmtNodes.py
index 71beec3b5c6c8..73dbb1fc4239f 100644
--- a/utils/gyb_syntax_support/StmtNodes.py
+++ b/utils/gyb_syntax_support/StmtNodes.py
@@ -41,7 +41,8 @@
     # switch-case-list -> switch-case switch-case-list?
     Node('SwitchCaseList', kind='SyntaxCollection',
          element='Syntax', element_name='SwitchCase',
-         element_choices=['SwitchCase', 'IfConfigDecl']),
+         element_choices=['SwitchCase', 'IfConfigDecl'],
+         elements_separated_by_newline=True),
 
     # repeat-while-stmt -> label? ':'? 'repeat' code-block 'while' expr ';'?
     Node('RepeatWhileStmt', kind='Stmt',
@@ -116,7 +117,8 @@
              Child('LeftBrace', kind='LeftBraceToken'),
              Child('Cases', kind='SwitchCaseList',
                    collection_element_name='Case'),
-             Child('RightBrace', kind='RightBraceToken'),
+             Child('RightBrace', kind='RightBraceToken',
+                   requires_leading_newline=True),
          ]),
 
     # catch-clause-list -> catch-clause catch-clause-list?
@@ -315,7 +317,8 @@
                        Child('Case', kind='SwitchCaseLabel'),
                    ]),
              Child('Statements', kind='CodeBlockItemList',
-                   collection_element_name='Statement'),
+                   collection_element_name='Statement',
+                   is_indented=True),
          ]),
 
     # switch-default-label -> 'default' ':'