diff --git a/grammar.js b/grammar.js
index 17f6be2..412b70b 100644
--- a/grammar.js
+++ b/grammar.js
@@ -101,13 +101,14 @@ module.exports = grammar({
     [$._inline_type, $.function_type_parameters],
     [$.primary_expression, $.parameter, $._pattern],
     [$.parameter, $._pattern],
-    [$.parameter, $._parenthesized_pattern],
-    [$._switch_value_pattern, $._parenthesized_pattern],
+    [$.parameter, $.parenthesized_pattern],
     [$.variant_declaration],
     [$.unit, $._function_type_parameter_list],
     [$.functor_parameter, $.module_primary_expression, $.module_identifier_path],
     [$._reserved_identifier, $.function],
-    [$.polyvar_type]
+    [$.polyvar_type],
+    [$._let_binding, $.or_pattern],
+    [$.exception_pattern, $.or_pattern]
   ],
 
   rules: {
@@ -690,45 +691,17 @@ module.exports = grammar({
 
     switch_match: $ => prec.dynamic(-1, seq(
       '|',
-      $._switch_pattern,
+      field('pattern', $._pattern),
+      optional($.guard),
       '=>',
-      $._one_or_more_statements,
-    )),
-
-    _switch_pattern: $ => barSep1(choice(
-      alias($._switch_exception_pattern, $.exception),
-      $._parenthesized_switch_pattern,
-      $._switch_value_pattern,
-      $._switch_range_pattern,
+      field('body', alias($._one_or_more_statements, $.sequence_expression)),
     )),
 
-    _switch_exception_pattern: $ => seq(
-      'exception',
-      $._switch_value_pattern,
-    ),
-
-    _parenthesized_switch_pattern: $ => seq(
-      '(',
-      $._switch_pattern,
-      ')',
-    ),
-
-    _switch_value_pattern: $ => seq(
-      $._pattern,
-      optional($.switch_pattern_condition),
-    ),
-
-    switch_pattern_condition: $ => seq(
+    guard: $ => seq(
       choice('if', 'when'),
       $.expression,
     ),
 
-    _switch_range_pattern: $ => seq(
-      $._literal_pattern,
-      '..',
-      $._literal_pattern,
-    ),
-
     polyvar_type_pattern: $ => seq(
       '#',
       '...',
@@ -867,7 +840,7 @@ module.exports = grammar({
     // unfinished constructs are generally treated as literal expressions,
     // not patterns.
     _pattern: $ => prec.dynamic(-1, seq(
-      barSep1(choice(
+      choice(
         $.value_identifier,
         $._literal_pattern,
         $._destructuring_pattern,
@@ -875,13 +848,26 @@ module.exports = grammar({
         $.unit,
         $.module_pack,
         $.lazy_pattern,
-        $._parenthesized_pattern,
-      )),
+        $.parenthesized_pattern,
+        $.or_pattern,
+        $.range_pattern,
+        $.exception_pattern
+      ),
       optional($.type_annotation),
       optional($.as_aliasing),
     )),
 
-    _parenthesized_pattern: $ => seq('(', $._pattern, ')'),
+    parenthesized_pattern: $ => seq('(', $._pattern, ')'),
+
+    range_pattern: $ => seq(
+      $._literal_pattern,
+      '..',
+      $._literal_pattern,
+    ),
+
+    or_pattern: $ => prec.left(seq($._pattern, '|', $._pattern)),
+
+    exception_pattern: $ => seq('exception', $._pattern),
 
     _destructuring_pattern: $ => choice(
       $.variant_pattern,
@@ -916,7 +902,7 @@ module.exports = grammar({
     ),
 
     _variant_pattern_parameter: $ => seq(
-      barSep1($._pattern),
+      $._pattern,
       optional($.type_annotation),
     ),
 
@@ -934,7 +920,7 @@ module.exports = grammar({
         ),
         optional(seq(
           ':',
-          barSep1($._pattern),
+          $._pattern,
         )),
       )),
       '}'
@@ -984,7 +970,7 @@ module.exports = grammar({
         $._literal_pattern,
         $._destructuring_pattern,
         $.polyvar_type_pattern,
-        $._parenthesized_pattern,
+        $.parenthesized_pattern,
       )
     ),
 
diff --git a/test/corpus/comments.txt b/test/corpus/comments.txt
index ebd1c15..e61cbdf 100644
--- a/test/corpus/comments.txt
+++ b/test/corpus/comments.txt
@@ -66,5 +66,7 @@ switch foo {
   (expression_statement
     (switch_expression
       (value_identifier)
-      (switch_match (number) (expression_statement (number)))
+      (switch_match
+        (number) 
+        (sequence_expression (expression_statement (number))))
       (comment))))
diff --git a/test/corpus/expressions.txt b/test/corpus/expressions.txt
index 9ff0818..dba7296 100644
--- a/test/corpus/expressions.txt
+++ b/test/corpus/expressions.txt
@@ -421,16 +421,18 @@ switch foo {
     (switch_expression
       (value_identifier)
       (switch_match
-        (number)
-        (number)
-        (expression_statement (string (string_fragment))))
+        (or_pattern
+          (number)
+          (number))
+        (sequence_expression (expression_statement (string (string_fragment)))))
       (switch_match
         (value_identifier)
-        (let_binding (value_identifier) (string (string_fragment)))
-        (expression_statement
-          (binary_expression
-            (value_identifier)
-            (string (string_fragment))))))))
+        (sequence_expression
+          (let_binding (value_identifier) (string (string_fragment)))
+          (expression_statement
+            (binary_expression
+              (value_identifier)
+              (string (string_fragment)))))))))
 
 ===========================================
 Switch of variants
@@ -458,16 +460,16 @@ switch foo {
             (record_pattern
               (value_identifier)
               (value_identifier))))
-        (expression_statement (value_identifier)))
+        (sequence_expression (expression_statement (value_identifier))))
       (switch_match
         (variant_pattern
           (nested_variant_identifier
             (module_identifier)
             (variant_identifier)))
-        (expression_statement (number)))
+        (sequence_expression (expression_statement (number))))
       (switch_match
         (variant_pattern (variant_identifier) (formal_parameters))
-        (expression_statement (number))))))
+        (sequence_expression (expression_statement (number)))))))
 
 ===========================================
 Switch of polyvars
@@ -487,7 +489,7 @@ switch foo {
       (value_identifier)
       (switch_match
         (polyvar_pattern (polyvar_identifier))
-        (expression_statement (number)))
+        (sequence_expression (expression_statement (number))))
       (switch_match
         (polyvar_pattern
           (polyvar_identifier)
@@ -497,14 +499,14 @@ switch foo {
             (type_annotation (type_identifier)))
             (number)))
         (as_aliasing (value_identifier))
-        (expression_statement (number)))
+        (sequence_expression (expression_statement (number))))
       (switch_match
         (polyvar_type_pattern
           (type_identifier_path
             (module_identifier)
             (type_identifier)))
             (as_aliasing (value_identifier))
-        (expression_statement (number))))))
+        (sequence_expression (expression_statement (number)))))))
 
 ===========================================
 Switch of vars
@@ -524,19 +526,19 @@ switch foo {
       (value_identifier)
       (switch_match
         (value_identifier)
-        (switch_pattern_condition
+        (guard
           (binary_expression
             (binary_expression (value_identifier) (number))
             (binary_expression (value_identifier) (number))))
-        (expression_statement (value_identifier)))
+        (sequence_expression (expression_statement (value_identifier))))
       (switch_match
         (value_identifier)
-        (switch_pattern_condition
+        (guard
           (binary_expression (value_identifier) (number)))
-        (expression_statement (value_identifier)))
+        (sequence_expression (expression_statement (value_identifier))))
       (switch_match
         (value_identifier)
-        (expression_statement (number))))))
+        (sequence_expression (expression_statement (number)))))))
 
 ===========================================
 Switch of tuples
@@ -558,17 +560,17 @@ switch (foo, bar) {
         (tuple_pattern
           (tuple_item_pattern (number))
           (tuple_item_pattern (number) (as_aliasing (value_identifier))))
-        (expression_statement (number)))
+        (sequence_expression (expression_statement (number))))
       (switch_match
         (tuple_pattern
           (tuple_item_pattern (variant_pattern (variant_identifier)))
           (tuple_item_pattern (polyvar_type_pattern (type_identifier))))
-        (expression_statement (number)))
+        (sequence_expression (expression_statement (number))))
       (switch_match
         (tuple_pattern
           (tuple_item_pattern (value_identifier))
           (tuple_item_pattern (value_identifier)))
-        (expression_statement (number))))))
+        (sequence_expression (expression_statement (number)))))))
 
 ===========================================
 Switch of mixed tuples
@@ -588,13 +590,14 @@ switch tuple {
       (switch_match
         (tuple_pattern
           (tuple_item_pattern
-            (variant_pattern (variant_identifier))
-            (variant_pattern (variant_identifier)))
+            (or_pattern
+              (variant_pattern (variant_identifier))
+              (variant_pattern (variant_identifier))))
           (tuple_item_pattern (number)))
-        (expression_statement (number)))
+        (sequence_expression (expression_statement (number))))
     (switch_match
       (value_identifier)
-      (expression_statement (number))))))
+      (sequence_expression (expression_statement (number)))))))
 
 ===========================================
 Switch of record patterns
@@ -622,9 +625,10 @@ switch person {
           (formal_parameters
             (record_pattern
               (value_identifier)
-              (string (string_fragment))
-              (string (string_fragment)))))
-        (expression_statement (number)))
+              (or_pattern
+                (string (string_fragment))
+                (string (string_fragment))))))
+        (sequence_expression (expression_statement (number))))
       (switch_match
         (variant_pattern
           (variant_identifier)
@@ -635,13 +639,14 @@ switch person {
                 (value_identifier)
                 (number))
               (value_identifier)
-              (variant_pattern
-                (variant_identifier)
-                (formal_parameters (value_identifier)))
-              (variant_pattern
-                (variant_identifier)
-                (formal_parameters (value_identifier))))))
-        (expression_statement (number)))
+              (or_pattern
+                (variant_pattern
+                  (variant_identifier)
+                  (formal_parameters (value_identifier)))
+                (variant_pattern
+                  (variant_identifier)
+                  (formal_parameters (value_identifier)))))))
+        (sequence_expression (expression_statement (number))))
       (switch_match
         (variant_pattern
           (variant_identifier)
@@ -649,13 +654,13 @@ switch person {
             (record_pattern
               (value_identifier)
               (variant_pattern (variant_identifier)))))
-        (expression_statement (number)))
+        (sequence_expression (expression_statement (number))))
       (switch_match
         (variant_pattern
           (variant_identifier)
           (formal_parameters
             (record_pattern (value_identifier))))
-        (expression_statement (number))))))
+        (sequence_expression (expression_statement (number)))))))
 
 ===========================================
 Switch of lists
@@ -680,16 +685,16 @@ switch foo {
           (value_identifier)
           (as_aliasing (value_identifier))
           (spread_pattern (value_identifier)))
-        (expression_statement (number)))
+        (sequence_expression (expression_statement (number))))
       (switch_match
         (list_pattern (number) (number) (value_identifier))
-        (expression_statement (number)))
+        (sequence_expression (expression_statement (number))))
       (switch_match
         (list_pattern (number))
-        (expression_statement (number)))
+        (sequence_expression (expression_statement (number))))
       (switch_match
         (list_pattern (spread_pattern (value_identifier)))
-        (expression_statement (number)))
+        (sequence_expression (expression_statement (number))))
       (switch_match
         (list_pattern
           (number)
@@ -699,7 +704,7 @@ switch foo {
               (value_identifier)
               (spread_pattern (value_identifier))))
           (as_aliasing (value_identifier)))
-        (expression_statement (value_identifier))))))
+        (sequence_expression (expression_statement (value_identifier)))))))
 
 ===========================================
 Switch of arrays
@@ -721,20 +726,20 @@ switch foo {
       (value_identifier)
       (switch_match
         (array_pattern (value_identifier) (spread_pattern (value_identifier)))
-        (expression_statement (number)))
+        (sequence_expression (expression_statement (number))))
       (switch_match
         (array_pattern
           (number)
           (number)
           (as_aliasing (value_identifier))
           (value_identifier))
-        (expression_statement (number)))
+        (sequence_expression (expression_statement (number))))
       (switch_match
         (array_pattern (number))
-        (expression_statement (number)))
+        (sequence_expression (expression_statement (number))))
       (switch_match
         (array_pattern (spread_pattern (value_identifier)))
-        (expression_statement (number))))))
+        (sequence_expression (expression_statement (number)))))))
 
 ===========================================
 Switch of statements
@@ -757,29 +762,33 @@ switch (element->HtmlInputElement.ofElement) {
           (value_identifier)
           (value_identifier_path (module_identifier) (value_identifier))))
       (switch_match
-        (variant_pattern
-          (variant_identifier)
-          (formal_parameters
-            (value_identifier)))
-        (expression_statement
-          (call_expression
-            function: (value_identifier_path
-              (module_identifier)
-              (value_identifier))
-            arguments: (arguments
-              (value_identifier))))
-        (expression_statement
-          (call_expression
-            function: (value_identifier_path
-              (module_identifier)
-              (value_identifier))
-            arguments: (arguments
-              (value_identifier)))))
+        pattern:
+          (variant_pattern
+            (variant_identifier)
+            (formal_parameters
+              (value_identifier)))
+        body: (sequence_expression
+          (expression_statement
+            (call_expression
+              function: (value_identifier_path
+                (module_identifier)
+                (value_identifier))
+              arguments: (arguments
+                (value_identifier))))
+          (expression_statement
+            (call_expression
+              function: (value_identifier_path
+                (module_identifier)
+                (value_identifier))
+              arguments: (arguments
+                (value_identifier))))))
       (switch_match
-        (variant_pattern
-          (variant_identifier))
-        (expression_statement
-          (unit))))))
+        pattern:
+          (variant_pattern
+            (variant_identifier))
+        body: (sequence_expression
+          (expression_statement
+            (unit)))))))
 
 ===========================================
 Switch exceptions
@@ -796,15 +805,17 @@ switch parseExn(str) {
   (expression_statement
     (switch_expression
       (call_expression (value_identifier) (arguments (value_identifier)))
-      (switch_match (value_identifier) (expression_statement (number)))
       (switch_match
-        (exception
+        (value_identifier)
+        (sequence_expression (expression_statement (number))))
+      (switch_match
+        (exception_pattern
           (variant_pattern
             (nested_variant_identifier
               (module_identifier_path (module_identifier) (module_identifier))
               (variant_identifier))
             (formal_parameters (value_identifier))))
-        (expression_statement (number))))))
+        (sequence_expression (expression_statement (number)))))))
 
 ===========================================
 Switch block
@@ -825,7 +836,7 @@ switch { open Mod; foo() } {
           (call_expression (value_identifier) (arguments))))
       (switch_match
         (value_identifier)
-        (expression_statement (number))))))
+        (sequence_expression (expression_statement (number)))))))
 
 ===========================================
 Switch parenthesized
@@ -833,7 +844,6 @@ Switch parenthesized
 
 switch n {
 | (1 | 2) => 1
-| (n if n > 10 | n if n < 42) | 50 | (n if n > 100) => n
 | Some((This | That) | Unknow) => 0
 }
 
@@ -844,26 +854,22 @@ switch n {
     (switch_expression
       (value_identifier)
       (switch_match
-        (number)
-        (number)
-        (expression_statement (number)))
-      (switch_match
-        (value_identifier)
-        (switch_pattern_condition (binary_expression (value_identifier) (number)))
-        (value_identifier)
-        (switch_pattern_condition (binary_expression (value_identifier) (number)))
-        (number)
-        (value_identifier)
-        (switch_pattern_condition (binary_expression (value_identifier) (number)))
-        (expression_statement (value_identifier)))
+        (parenthesized_pattern
+          (or_pattern
+            (number)
+            (number)))
+        (sequence_expression (expression_statement (number))))
       (switch_match
         (variant_pattern
           (variant_identifier)
           (formal_parameters
-            (variant_pattern (variant_identifier))
-            (variant_pattern (variant_identifier))
-            (variant_pattern (variant_identifier))))
-          (expression_statement (number))))))
+            (or_pattern
+              (parenthesized_pattern
+                (or_pattern
+                  (variant_pattern (variant_identifier))
+                  (variant_pattern (variant_identifier))))
+            (variant_pattern (variant_identifier)))))
+          (sequence_expression (expression_statement (number)))))))
 
 ===========================================
 Switch ranges
@@ -879,7 +885,10 @@ switch c {
   (expression_statement
     (switch_expression
       (value_identifier)
-      (switch_match (character) (character) (expression_statement (number))))))
+      (switch_match
+        (range_pattern
+          (character) (character))
+        (sequence_expression (expression_statement (number)))))))
 
 ===========================================
 Math operators
@@ -1262,7 +1271,9 @@ try switch foo() {
   (expression_statement
     (try_expression
       (block (expression_statement (call_expression (value_identifier) (arguments))))
-      (switch_match (variant_pattern (variant_identifier)) (expression_statement (number)))
+      (switch_match 
+        (variant_pattern (variant_identifier)) 
+        (sequence_expression (expression_statement (number))))
       (switch_match
         (variant_pattern
           (variant_identifier)
@@ -1270,7 +1281,7 @@ try switch foo() {
             (record_pattern
               (value_identifier)
               (value_identifier))))
-        (expression_statement (number)))
+        (sequence_expression (expression_statement (number))))
       (switch_match
         (variant_pattern
           (nested_variant_identifier
@@ -1279,14 +1290,20 @@ try switch foo() {
               (module_identifier))
             (variant_identifier))
           (formal_parameters (value_identifier)))
-        (expression_statement (number)))))
+        (sequence_expression (expression_statement (number))))))
   (expression_statement
     (try_expression
       (switch_expression
         (call_expression (value_identifier) (arguments))
-        (switch_match (number) (expression_statement (string (string_fragment))))
-        (switch_match (number) (expression_statement (string (string_fragment))))
-        (switch_match (value_identifier) (expression_statement (string (string_fragment)))))
+        (switch_match
+          (number)
+          (sequence_expression (expression_statement (string (string_fragment)))))
+        (switch_match
+          (number)
+          (sequence_expression (expression_statement (string (string_fragment)))))
+        (switch_match
+          (value_identifier)
+          (sequence_expression (expression_statement (string (string_fragment))))))
       (switch_match
         (variant_pattern
           (nested_variant_identifier
@@ -1295,7 +1312,7 @@ try switch foo() {
               (module_identifier))
             (variant_identifier))
           (formal_parameters (value_identifier)))
-        (expression_statement (string (string_fragment)))))))
+        (sequence_expression (expression_statement (string (string_fragment))))))))
 
 ===========================================
 Mutation expressions