diff --git a/toolchain/check/handle_paren.cpp b/toolchain/check/handle_paren.cpp
index 6513b578f3bf..7dc1df71fef2 100644
--- a/toolchain/check/handle_paren.cpp
+++ b/toolchain/check/handle_paren.cpp
@@ -10,16 +10,14 @@ auto HandleParenExpr(Context& context, Parse::NodeId parse_node) -> bool {
   auto value_id = context.node_stack().PopExpr();
   // ParamOrArgStart was called for tuple handling; clean up the ParamOrArg
   // support for non-tuple cases.
-  context.ParamOrArgEnd(Parse::NodeKind::ParenExprOrTupleLiteralStart);
+  context.ParamOrArgEnd(Parse::NodeKind::ExprOpenParen);
   context.node_stack()
-      .PopAndDiscardSoloParseNode<
-          Parse::NodeKind::ParenExprOrTupleLiteralStart>();
+      .PopAndDiscardSoloParseNode<Parse::NodeKind::ExprOpenParen>();
   context.node_stack().Push(parse_node, value_id);
   return true;
 }
 
-auto HandleParenExprOrTupleLiteralStart(Context& context,
-                                        Parse::NodeId parse_node) -> bool {
+auto HandleExprOpenParen(Context& context, Parse::NodeId parse_node) -> bool {
   context.node_stack().Push(parse_node);
   context.ParamOrArgStart();
   return true;
@@ -32,12 +30,10 @@ auto HandleTupleLiteralComma(Context& context, Parse::NodeId /*parse_node*/)
 }
 
 auto HandleTupleLiteral(Context& context, Parse::NodeId parse_node) -> bool {
-  auto refs_id =
-      context.ParamOrArgEnd(Parse::NodeKind::ParenExprOrTupleLiteralStart);
+  auto refs_id = context.ParamOrArgEnd(Parse::NodeKind::ExprOpenParen);
 
   context.node_stack()
-      .PopAndDiscardSoloParseNode<
-          Parse::NodeKind::ParenExprOrTupleLiteralStart>();
+      .PopAndDiscardSoloParseNode<Parse::NodeKind::ExprOpenParen>();
   const auto& inst_block = context.inst_blocks().Get(refs_id);
   llvm::SmallVector<SemIR::TypeId> type_ids;
   type_ids.reserve(inst_block.size());
diff --git a/toolchain/check/node_stack.h b/toolchain/check/node_stack.h
index 4a77ffdbea93..7d129d67a085 100644
--- a/toolchain/check/node_stack.h
+++ b/toolchain/check/node_stack.h
@@ -365,13 +365,13 @@ class NodeStack {
       case Parse::NodeKind::ArrayExprSemi:
       case Parse::NodeKind::ClassIntroducer:
       case Parse::NodeKind::CodeBlockStart:
+      case Parse::NodeKind::ExprOpenParen:
       case Parse::NodeKind::FunctionIntroducer:
       case Parse::NodeKind::IfStatementElse:
       case Parse::NodeKind::ImplicitParamListStart:
       case Parse::NodeKind::InterfaceIntroducer:
       case Parse::NodeKind::LetIntroducer:
       case Parse::NodeKind::ParamListStart:
-      case Parse::NodeKind::ParenExprOrTupleLiteralStart:
       case Parse::NodeKind::QualifiedDecl:
       case Parse::NodeKind::ReturnedModifier:
       case Parse::NodeKind::ReturnStatementStart:
diff --git a/toolchain/parse/handle_paren_expr.cpp b/toolchain/parse/handle_paren_expr.cpp
index 9b87611b0dc7..9b445380de38 100644
--- a/toolchain/parse/handle_paren_expr.cpp
+++ b/toolchain/parse/handle_paren_expr.cpp
@@ -10,23 +10,21 @@ auto HandleParenExpr(Context& context) -> void {
   auto state = context.PopState();
 
   // Advance past the open paren.
-  context.AddLeafNode(NodeKind::ParenExprOrTupleLiteralStart,
+  context.AddLeafNode(NodeKind::ExprOpenParen,
                       context.ConsumeChecked(Lex::TokenKind::OpenParen));
 
   if (context.PositionIs(Lex::TokenKind::CloseParen)) {
-    state.state = State::ParenExprFinishAsTuple;
+    state.state = State::TupleLiteralFinish;
     context.PushState(state);
   } else {
-    state.state = State::ParenExprFinishAsNormal;
+    state.state = State::ParenExprFinish;
     context.PushState(state);
-    context.PushState(State::ParenExprParamFinishAsUnknown);
+    context.PushState(State::ExprAfterOpenParenFinish);
     context.PushState(State::Expr);
   }
 }
 
-// Handles ParenExprParamFinishAs(Unknown|Tuple).
-static auto HandleParenExprParamFinish(Context& context, bool as_tuple)
-    -> void {
+auto HandleExprAfterOpenParenFinish(Context& context) -> void {
   auto state = context.PopState();
 
   auto list_token_kind = context.ConsumeListToken(
@@ -35,42 +33,41 @@ static auto HandleParenExprParamFinish(Context& context, bool as_tuple)
     return;
   }
 
-  // If this is the first item and a comma was found, switch to tuple handling.
-  // Note this could be `(expr,)` so we may not reuse the current state, but
-  // it's still necessary to switch the parent.
-  if (!as_tuple) {
-    state.state = State::ParenExprParamFinishAsTuple;
+  // We found a comma, so switch parent state to tuple handling.
+  auto finish_state = context.PopState();
+  CARBON_CHECK(finish_state.state == State::ParenExprFinish)
+      << "Unexpected parent state, found: " << finish_state.state;
+  finish_state.state = State::TupleLiteralFinish;
+  context.PushState(finish_state);
 
-    auto finish_state = context.PopState();
-    CARBON_CHECK(finish_state.state == State::ParenExprFinishAsNormal)
-        << "Unexpected parent state, found: " << finish_state.state;
-    finish_state.state = State::ParenExprFinishAsTuple;
-    context.PushState(finish_state);
-  }
-
-  // On a comma, push another expression handler.
-  if (list_token_kind == Context::ListTokenKind::Comma) {
+  // If the comma is not immediately followed by a close paren, push handlers
+  // for the next tuple element.
+  if (list_token_kind != Context::ListTokenKind::CommaClose) {
+    state.state = State::TupleLiteralElementFinish;
     context.PushState(state);
     context.PushState(State::Expr);
   }
 }
 
-auto HandleParenExprParamFinishAsUnknown(Context& context) -> void {
-  HandleParenExprParamFinish(context, /*as_tuple=*/false);
+auto HandleTupleLiteralElementFinish(Context& context) -> void {
+  auto state = context.PopState();
+
+  if (context.ConsumeListToken(NodeKind::TupleLiteralComma,
+                               Lex::TokenKind::CloseParen, state.has_error) ==
+      Context::ListTokenKind::Comma) {
+    context.PushState(state);
+    context.PushState(State::Expr);
+  }
 }
 
-auto HandleParenExprParamFinishAsTuple(Context& context) -> void {
-  HandleParenExprParamFinish(context, /*as_tuple=*/true);
-}
-
-auto HandleParenExprFinishAsNormal(Context& context) -> void {
+auto HandleParenExprFinish(Context& context) -> void {
   auto state = context.PopState();
 
   context.AddNode(NodeKind::ParenExpr, context.Consume(), state.subtree_start,
                   state.has_error);
 }
 
-auto HandleParenExprFinishAsTuple(Context& context) -> void {
+auto HandleTupleLiteralFinish(Context& context) -> void {
   auto state = context.PopState();
 
   context.AddNode(NodeKind::TupleLiteral, context.Consume(),
diff --git a/toolchain/parse/node_kind.def b/toolchain/parse/node_kind.def
index c92260600c71..95fcbf9d23da 100644
--- a/toolchain/parse/node_kind.def
+++ b/toolchain/parse/node_kind.def
@@ -419,13 +419,13 @@ CARBON_PARSE_NODE_KIND_CHILD_COUNT(IndexExprStart, 1,
 CARBON_PARSE_NODE_KIND_BRACKET(IndexExpr, IndexExprStart,
                                CARBON_TOKEN(CloseSquareBracket))
 
-// Parenthesized expressions, such as `(2)`:
-//   ParenExprOrTupleLiteralStart
+// Parenthesized single expressions, such as `(2)`:
+//   ExprOpenParen
 //   _external_: expression
 // ParenExpr
 //
 // Tuples, such as `(1, 2)`:
-//   ParenExprOrTupleLiteralStart
+//   ExprOpenParen
 //     _external_: expression
 //     TupleLiteralComma
 //   _repeated_
@@ -433,12 +433,12 @@ CARBON_PARSE_NODE_KIND_BRACKET(IndexExpr, IndexExprStart,
 //
 // Expressions and TupleLiteralComma may repeat with TupleLiteralComma as a
 // separator.
-CARBON_PARSE_NODE_KIND_CHILD_COUNT(ParenExprOrTupleLiteralStart, 0,
+CARBON_PARSE_NODE_KIND_CHILD_COUNT(ExprOpenParen, 0,
                                    CARBON_TOKEN(OpenParen))
-CARBON_PARSE_NODE_KIND_BRACKET(ParenExpr, ParenExprOrTupleLiteralStart,
+CARBON_PARSE_NODE_KIND_BRACKET(ParenExpr, ExprOpenParen,
                                CARBON_TOKEN(CloseParen))
 CARBON_PARSE_NODE_KIND_CHILD_COUNT(TupleLiteralComma, 0, CARBON_TOKEN(Comma))
-CARBON_PARSE_NODE_KIND_BRACKET(TupleLiteral, ParenExprOrTupleLiteralStart,
+CARBON_PARSE_NODE_KIND_BRACKET(TupleLiteral, ExprOpenParen,
                                CARBON_TOKEN(CloseParen))
 
 // Call expressions, such as `a()`:
diff --git a/toolchain/parse/state.def b/toolchain/parse/state.def
index 6884d2ca586a..e5bbfa7c3bc7 100644
--- a/toolchain/parse/state.def
+++ b/toolchain/parse/state.def
@@ -725,45 +725,67 @@ CARBON_PARSE_STATE_VARIANTS2(ParenCondition, If, While)
 //   (state done)
 CARBON_PARSE_STATE_VARIANTS2(ParenConditionFinish, If, While)
 
-// Handles the `(` of a parenthesized expression.
+// Handles the `(` of a parenthesized single expression
 //
 // ( )
 // ^
-//   1. ParenExprFinishAsTuple
+//   1. TupleLiteralFinish
 //
 // ( ... )
 // ^
 //   1. Expr
-//   2. ParenExprParamFinishAsUnknown
-//   3. ParenExprFinishAsNormal    (SPECIAL: may be replaced)
+//   2. ExprAfterOpenParenFinish
+//   3. ParenExprFinish    (SPECIAL: may be replaced)
 CARBON_PARSE_STATE(ParenExpr)
 
-// Handles the end of a parenthesized expression's parameter. This will start as
-// AsUnknown on the first parameter; if there are more, it switches to AsTuple
-// processing.
-//
-// ( ... , )
-//       ^
-//   (state done)
-//   SPECIAL (variant is Unknown): parent becomes ParenExprFinishAsTuple
-//
-// ( ... , ... )
-//       ^
-//   1. Expression
-//   2. ParenExpressionParamFinishAsTuple
-//   SPECIAL (variant is Unknown): parent becomes ParenExprFinishAsTuple
-//
-//  ...
-// ^
-//   (state done)
-CARBON_PARSE_STATE_VARIANTS2(ParenExprParamFinish, Unknown, Tuple)
-
-// Handles the `)` of a parenthesized expression.
+// Handles the `)` of a tuple literal.
 //
 // ( ... )
 //       ^
 //   (state done)
-CARBON_PARSE_STATE_VARIANTS2(ParenExprFinish, Normal, Tuple)
+CARBON_PARSE_STATE(TupleLiteralFinish)
+
+// Handles the end of an expression following an open parenthesis.
+//
+// ( ... , )
+//       ^
+//   (state done)
+//   SPECIAL: parent becomes TupleLiteralFinish
+//
+// ( ... , ... )
+//       ^
+//   1. Expression
+//   2. TupleLiteralElementFinish
+//   SPECIAL: parent becomes TupleLiteralFinish
+//
+// ( ... )
+//      ^
+//   (state done)
+CARBON_PARSE_STATE(ExprAfterOpenParenFinish)
+
+// Handles the end of an expression that is known to be an element of a tuple
+// literal expression.
+//
+// ( ... , )
+//       ^
+//   (state done)
+//
+// ( ... , ... )
+//       ^
+//   1. Expression
+//   2. TupleLiteralElementFinish
+//
+// ( ... )
+//      ^
+//   (state done)
+CARBON_PARSE_STATE(TupleLiteralElementFinish)
+
+// Handles the `)` of a parenthesized single expression.
+//
+// ( ... )
+//       ^
+//   (state done)
+CARBON_PARSE_STATE(ParenExprFinish)
 
 // Handles processing of a pattern.
 //
diff --git a/toolchain/parse/testdata/basics/fail_paren_match_regression.carbon b/toolchain/parse/testdata/basics/fail_paren_match_regression.carbon
index eabff1fb4b15..a5fb94647d58 100644
--- a/toolchain/parse/testdata/basics/fail_paren_match_regression.carbon
+++ b/toolchain/parse/testdata/basics/fail_paren_match_regression.carbon
@@ -23,7 +23,7 @@ var = (foo {})
 // CHECK:STDOUT:         {kind: 'InvalidParse', text: '=', has_error: yes},
 // CHECK:STDOUT:       {kind: 'BindingPattern', text: '=', has_error: yes, subtree_size: 3},
 // CHECK:STDOUT:       {kind: 'VariableInitializer', text: '='},
-// CHECK:STDOUT:         {kind: 'ParenExprOrTupleLiteralStart', text: '('},
+// CHECK:STDOUT:         {kind: 'ExprOpenParen', text: '('},
 // CHECK:STDOUT:         {kind: 'IdentifierNameExpr', text: 'foo'},
 // CHECK:STDOUT:       {kind: 'ParenExpr', text: ')', has_error: yes, subtree_size: 3},
 // CHECK:STDOUT:     {kind: 'VariableDecl', text: 'var', has_error: yes, subtree_size: 9},
diff --git a/toolchain/parse/testdata/basics/function_call.carbon b/toolchain/parse/testdata/basics/function_call.carbon
index f4a127ec3e20..270ab24691a8 100644
--- a/toolchain/parse/testdata/basics/function_call.carbon
+++ b/toolchain/parse/testdata/basics/function_call.carbon
@@ -27,7 +27,7 @@ fn F() {
 // CHECK:STDOUT:                   {kind: 'IdentifierName', text: 'd'},
 // CHECK:STDOUT:                 {kind: 'MemberAccessExpr', text: '.', subtree_size: 3},
 // CHECK:STDOUT:                 {kind: 'CallExprComma', text: ','},
-// CHECK:STDOUT:                   {kind: 'ParenExprOrTupleLiteralStart', text: '('},
+// CHECK:STDOUT:                   {kind: 'ExprOpenParen', text: '('},
 // CHECK:STDOUT:                   {kind: 'IdentifierNameExpr', text: 'e'},
 // CHECK:STDOUT:                 {kind: 'ParenExpr', text: ')', subtree_size: 3},
 // CHECK:STDOUT:               {kind: 'CallExpr', text: ')', subtree_size: 14},
diff --git a/toolchain/parse/testdata/basics/numeric_literals.carbon b/toolchain/parse/testdata/basics/numeric_literals.carbon
index c062c4a9d2ba..10585a4c5154 100644
--- a/toolchain/parse/testdata/basics/numeric_literals.carbon
+++ b/toolchain/parse/testdata/basics/numeric_literals.carbon
@@ -42,7 +42,7 @@ fn F() {
 // CHECK:STDOUT:           {kind: 'ArrayExpr', text: ']', subtree_size: 5},
 // CHECK:STDOUT:         {kind: 'BindingPattern', text: ':', subtree_size: 7},
 // CHECK:STDOUT:         {kind: 'VariableInitializer', text: '='},
-// CHECK:STDOUT:           {kind: 'ParenExprOrTupleLiteralStart', text: '('},
+// CHECK:STDOUT:           {kind: 'ExprOpenParen', text: '('},
 // CHECK:STDOUT:           {kind: 'IntLiteral', text: '8'},
 // CHECK:STDOUT:           {kind: 'TupleLiteralComma', text: ','},
 // CHECK:STDOUT:           {kind: 'IntLiteral', text: '9'},
@@ -64,7 +64,7 @@ fn F() {
 // CHECK:STDOUT:           {kind: 'ArrayExpr', text: ']', subtree_size: 5},
 // CHECK:STDOUT:         {kind: 'BindingPattern', text: ':', subtree_size: 7},
 // CHECK:STDOUT:         {kind: 'VariableInitializer', text: '='},
-// CHECK:STDOUT:           {kind: 'ParenExprOrTupleLiteralStart', text: '('},
+// CHECK:STDOUT:           {kind: 'ExprOpenParen', text: '('},
 // CHECK:STDOUT:           {kind: 'RealLiteral', text: '0.9'},
 // CHECK:STDOUT:           {kind: 'TupleLiteralComma', text: ','},
 // CHECK:STDOUT:           {kind: 'RealLiteral', text: '8.0'},
diff --git a/toolchain/parse/testdata/basics/parens.carbon b/toolchain/parse/testdata/basics/parens.carbon
index 5d60a5ed53ab..80392bca4c06 100644
--- a/toolchain/parse/testdata/basics/parens.carbon
+++ b/toolchain/parse/testdata/basics/parens.carbon
@@ -22,10 +22,10 @@ fn F(n: i32) -> i32 {
 // CHECK:STDOUT:         {kind: 'ReturnType', text: '->', subtree_size: 2},
 // CHECK:STDOUT:       {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 10},
 // CHECK:STDOUT:         {kind: 'ReturnStatementStart', text: 'return'},
-// CHECK:STDOUT:           {kind: 'ParenExprOrTupleLiteralStart', text: '('},
-// CHECK:STDOUT:             {kind: 'ParenExprOrTupleLiteralStart', text: '('},
-// CHECK:STDOUT:               {kind: 'ParenExprOrTupleLiteralStart', text: '('},
-// CHECK:STDOUT:                 {kind: 'ParenExprOrTupleLiteralStart', text: '('},
+// CHECK:STDOUT:           {kind: 'ExprOpenParen', text: '('},
+// CHECK:STDOUT:             {kind: 'ExprOpenParen', text: '('},
+// CHECK:STDOUT:               {kind: 'ExprOpenParen', text: '('},
+// CHECK:STDOUT:                 {kind: 'ExprOpenParen', text: '('},
 // CHECK:STDOUT:                 {kind: 'IdentifierNameExpr', text: 'n'},
 // CHECK:STDOUT:               {kind: 'ParenExpr', text: ')', subtree_size: 3},
 // CHECK:STDOUT:             {kind: 'ParenExpr', text: ')', subtree_size: 5},
diff --git a/toolchain/parse/testdata/let/let_tuple.carbon b/toolchain/parse/testdata/let/let_tuple.carbon
index 1f717f9ba55d..86a322738ef0 100644
--- a/toolchain/parse/testdata/let/let_tuple.carbon
+++ b/toolchain/parse/testdata/let/let_tuple.carbon
@@ -27,7 +27,7 @@ fn F() {
 // CHECK:STDOUT:           {kind: 'BindingPattern', text: ':', subtree_size: 3},
 // CHECK:STDOUT:         {kind: 'ParamList', text: ')', subtree_size: 9},
 // CHECK:STDOUT:         {kind: 'LetInitializer', text: '='},
-// CHECK:STDOUT:           {kind: 'ParenExprOrTupleLiteralStart', text: '('},
+// CHECK:STDOUT:           {kind: 'ExprOpenParen', text: '('},
 // CHECK:STDOUT:           {kind: 'StringLiteral', text: '"hello"'},
 // CHECK:STDOUT:           {kind: 'TupleLiteralComma', text: ','},
 // CHECK:STDOUT:           {kind: 'IntLiteral', text: '0'},
diff --git a/toolchain/parse/testdata/operators/fail_precedence_assign.carbon b/toolchain/parse/testdata/operators/fail_precedence_assign.carbon
index dc72b7a511e2..fbccfc8caddd 100644
--- a/toolchain/parse/testdata/operators/fail_precedence_assign.carbon
+++ b/toolchain/parse/testdata/operators/fail_precedence_assign.carbon
@@ -43,12 +43,12 @@ fn F() {
 // CHECK:STDOUT:         {kind: 'BindingPattern', text: ':', subtree_size: 3},
 // CHECK:STDOUT:       {kind: 'VariableDecl', text: ';', subtree_size: 5},
 // CHECK:STDOUT:           {kind: 'IntLiteral', text: '1'},
-// CHECK:STDOUT:             {kind: 'ParenExprOrTupleLiteralStart', text: '('},
+// CHECK:STDOUT:             {kind: 'ExprOpenParen', text: '('},
 // CHECK:STDOUT:             {kind: 'IdentifierNameExpr', text: 'a'},
 // CHECK:STDOUT:           {kind: 'ParenExpr', text: ')', has_error: yes, subtree_size: 3},
 // CHECK:STDOUT:         {kind: 'InfixOperator', text: '+', subtree_size: 5},
 // CHECK:STDOUT:       {kind: 'ExprStatement', text: ';', subtree_size: 6},
-// CHECK:STDOUT:           {kind: 'ParenExprOrTupleLiteralStart', text: '('},
+// CHECK:STDOUT:           {kind: 'ExprOpenParen', text: '('},
 // CHECK:STDOUT:               {kind: 'BoolLiteralTrue', text: 'true'},
 // CHECK:STDOUT:             {kind: 'IfExprIf', text: 'if', subtree_size: 2},
 // CHECK:STDOUT:               {kind: 'IdentifierNameExpr', text: 'a'},
diff --git a/toolchain/parse/testdata/operators/infix_with_paren_after.carbon b/toolchain/parse/testdata/operators/infix_with_paren_after.carbon
index 6a90521c5f3a..4e086e1331a5 100644
--- a/toolchain/parse/testdata/operators/infix_with_paren_after.carbon
+++ b/toolchain/parse/testdata/operators/infix_with_paren_after.carbon
@@ -15,7 +15,7 @@ var n: i8 = 3*(n);
 // CHECK:STDOUT:       {kind: 'BindingPattern', text: ':', subtree_size: 3},
 // CHECK:STDOUT:       {kind: 'VariableInitializer', text: '='},
 // CHECK:STDOUT:         {kind: 'IntLiteral', text: '3'},
-// CHECK:STDOUT:           {kind: 'ParenExprOrTupleLiteralStart', text: '('},
+// CHECK:STDOUT:           {kind: 'ExprOpenParen', text: '('},
 // CHECK:STDOUT:           {kind: 'IdentifierNameExpr', text: 'n'},
 // CHECK:STDOUT:         {kind: 'ParenExpr', text: ')', subtree_size: 3},
 // CHECK:STDOUT:       {kind: 'InfixOperator', text: '*', subtree_size: 5},
diff --git a/toolchain/parse/testdata/operators/infix_with_paren_before.carbon b/toolchain/parse/testdata/operators/infix_with_paren_before.carbon
index 60496d6c2302..3aac9565bc86 100644
--- a/toolchain/parse/testdata/operators/infix_with_paren_before.carbon
+++ b/toolchain/parse/testdata/operators/infix_with_paren_before.carbon
@@ -14,7 +14,7 @@ var n: i8 = (n)*3;
 // CHECK:STDOUT:         {kind: 'IntTypeLiteral', text: 'i8'},
 // CHECK:STDOUT:       {kind: 'BindingPattern', text: ':', subtree_size: 3},
 // CHECK:STDOUT:       {kind: 'VariableInitializer', text: '='},
-// CHECK:STDOUT:           {kind: 'ParenExprOrTupleLiteralStart', text: '('},
+// CHECK:STDOUT:           {kind: 'ExprOpenParen', text: '('},
 // CHECK:STDOUT:           {kind: 'IdentifierNameExpr', text: 'n'},
 // CHECK:STDOUT:         {kind: 'ParenExpr', text: ')', subtree_size: 3},
 // CHECK:STDOUT:         {kind: 'IntLiteral', text: '3'},
diff --git a/toolchain/parse/testdata/operators/precedence_assign.carbon b/toolchain/parse/testdata/operators/precedence_assign.carbon
index d744f51c7c8c..98bf8ff80e56 100644
--- a/toolchain/parse/testdata/operators/precedence_assign.carbon
+++ b/toolchain/parse/testdata/operators/precedence_assign.carbon
@@ -50,7 +50,7 @@ fn F(c: bool) {
 // CHECK:STDOUT:           {kind: 'IfExprElse', text: 'else', subtree_size: 6},
 // CHECK:STDOUT:         {kind: 'InfixOperator', text: '=', subtree_size: 9},
 // CHECK:STDOUT:       {kind: 'ExprStatement', text: ';', subtree_size: 10},
-// CHECK:STDOUT:             {kind: 'ParenExprOrTupleLiteralStart', text: '('},
+// CHECK:STDOUT:             {kind: 'ExprOpenParen', text: '('},
 // CHECK:STDOUT:                 {kind: 'IdentifierNameExpr', text: 'c'},
 // CHECK:STDOUT:               {kind: 'IfExprIf', text: 'if', subtree_size: 2},
 // CHECK:STDOUT:                 {kind: 'IdentifierNameExpr', text: 'a'},
diff --git a/toolchain/parse/testdata/pointer/const_pointer.carbon b/toolchain/parse/testdata/pointer/const_pointer.carbon
index 2b85b8d2acbc..5a2572256ae2 100644
--- a/toolchain/parse/testdata/pointer/const_pointer.carbon
+++ b/toolchain/parse/testdata/pointer/const_pointer.carbon
@@ -30,7 +30,7 @@ fn C() -> const (i32*) { return C(); }
 // CHECK:STDOUT:         {kind: 'IdentifierName', text: 'B'},
 // CHECK:STDOUT:           {kind: 'ParamListStart', text: '('},
 // CHECK:STDOUT:         {kind: 'ParamList', text: ')', subtree_size: 2},
-// CHECK:STDOUT:               {kind: 'ParenExprOrTupleLiteralStart', text: '('},
+// CHECK:STDOUT:               {kind: 'ExprOpenParen', text: '('},
 // CHECK:STDOUT:                 {kind: 'IntTypeLiteral', text: 'i32'},
 // CHECK:STDOUT:               {kind: 'PrefixOperator', text: 'const', subtree_size: 2},
 // CHECK:STDOUT:             {kind: 'ParenExpr', text: ')', subtree_size: 4},
@@ -47,7 +47,7 @@ fn C() -> const (i32*) { return C(); }
 // CHECK:STDOUT:         {kind: 'IdentifierName', text: 'C'},
 // CHECK:STDOUT:           {kind: 'ParamListStart', text: '('},
 // CHECK:STDOUT:         {kind: 'ParamList', text: ')', subtree_size: 2},
-// CHECK:STDOUT:               {kind: 'ParenExprOrTupleLiteralStart', text: '('},
+// CHECK:STDOUT:               {kind: 'ExprOpenParen', text: '('},
 // CHECK:STDOUT:                 {kind: 'IntTypeLiteral', text: 'i32'},
 // CHECK:STDOUT:               {kind: 'PostfixOperator', text: '*', subtree_size: 2},
 // CHECK:STDOUT:             {kind: 'ParenExpr', text: ')', subtree_size: 4},
diff --git a/toolchain/parse/testdata/tuple/nested.carbon b/toolchain/parse/testdata/tuple/nested.carbon
index 59c6049a61f1..6dfdf4bd942f 100644
--- a/toolchain/parse/testdata/tuple/nested.carbon
+++ b/toolchain/parse/testdata/tuple/nested.carbon
@@ -11,14 +11,14 @@ var y: ((), (), ());
 // CHECK:STDOUT:     {kind: 'FileStart', text: ''},
 // CHECK:STDOUT:       {kind: 'VariableIntroducer', text: 'var'},
 // CHECK:STDOUT:         {kind: 'IdentifierName', text: 'y'},
-// CHECK:STDOUT:           {kind: 'ParenExprOrTupleLiteralStart', text: '('},
-// CHECK:STDOUT:             {kind: 'ParenExprOrTupleLiteralStart', text: '('},
+// CHECK:STDOUT:           {kind: 'ExprOpenParen', text: '('},
+// CHECK:STDOUT:             {kind: 'ExprOpenParen', text: '('},
 // CHECK:STDOUT:           {kind: 'TupleLiteral', text: ')', subtree_size: 2},
 // CHECK:STDOUT:           {kind: 'TupleLiteralComma', text: ','},
-// CHECK:STDOUT:             {kind: 'ParenExprOrTupleLiteralStart', text: '('},
+// CHECK:STDOUT:             {kind: 'ExprOpenParen', text: '('},
 // CHECK:STDOUT:           {kind: 'TupleLiteral', text: ')', subtree_size: 2},
 // CHECK:STDOUT:           {kind: 'TupleLiteralComma', text: ','},
-// CHECK:STDOUT:             {kind: 'ParenExprOrTupleLiteralStart', text: '('},
+// CHECK:STDOUT:             {kind: 'ExprOpenParen', text: '('},
 // CHECK:STDOUT:           {kind: 'TupleLiteral', text: ')', subtree_size: 2},
 // CHECK:STDOUT:         {kind: 'TupleLiteral', text: ')', subtree_size: 10},
 // CHECK:STDOUT:       {kind: 'BindingPattern', text: ':', subtree_size: 12},
diff --git a/toolchain/parse/testdata/tuple/two_entries.carbon b/toolchain/parse/testdata/tuple/two_entries.carbon
index 8df674243fae..9ff4fe7e02db 100644
--- a/toolchain/parse/testdata/tuple/two_entries.carbon
+++ b/toolchain/parse/testdata/tuple/two_entries.carbon
@@ -11,14 +11,14 @@ var x: (i32, i32) = (1, 2);
 // CHECK:STDOUT:     {kind: 'FileStart', text: ''},
 // CHECK:STDOUT:       {kind: 'VariableIntroducer', text: 'var'},
 // CHECK:STDOUT:         {kind: 'IdentifierName', text: 'x'},
-// CHECK:STDOUT:           {kind: 'ParenExprOrTupleLiteralStart', text: '('},
+// CHECK:STDOUT:           {kind: 'ExprOpenParen', text: '('},
 // CHECK:STDOUT:           {kind: 'IntTypeLiteral', text: 'i32'},
 // CHECK:STDOUT:           {kind: 'TupleLiteralComma', text: ','},
 // CHECK:STDOUT:           {kind: 'IntTypeLiteral', text: 'i32'},
 // CHECK:STDOUT:         {kind: 'TupleLiteral', text: ')', subtree_size: 5},
 // CHECK:STDOUT:       {kind: 'BindingPattern', text: ':', subtree_size: 7},
 // CHECK:STDOUT:       {kind: 'VariableInitializer', text: '='},
-// CHECK:STDOUT:         {kind: 'ParenExprOrTupleLiteralStart', text: '('},
+// CHECK:STDOUT:         {kind: 'ExprOpenParen', text: '('},
 // CHECK:STDOUT:         {kind: 'IntLiteral', text: '1'},
 // CHECK:STDOUT:         {kind: 'TupleLiteralComma', text: ','},
 // CHECK:STDOUT:         {kind: 'IntLiteral', text: '2'},
diff --git a/toolchain/parse/testdata/var/var_tuple.carbon b/toolchain/parse/testdata/var/var_tuple.carbon
index 7ab81f140a63..bcba1017d842 100644
--- a/toolchain/parse/testdata/var/var_tuple.carbon
+++ b/toolchain/parse/testdata/var/var_tuple.carbon
@@ -27,7 +27,7 @@ fn F() {
 // CHECK:STDOUT:           {kind: 'BindingPattern', text: ':', subtree_size: 3},
 // CHECK:STDOUT:         {kind: 'ParamList', text: ')', subtree_size: 9},
 // CHECK:STDOUT:         {kind: 'VariableInitializer', text: '='},
-// CHECK:STDOUT:           {kind: 'ParenExprOrTupleLiteralStart', text: '('},
+// CHECK:STDOUT:           {kind: 'ExprOpenParen', text: '('},
 // CHECK:STDOUT:           {kind: 'StringLiteral', text: '"hello"'},
 // CHECK:STDOUT:           {kind: 'TupleLiteralComma', text: ','},
 // CHECK:STDOUT:           {kind: 'IntLiteral', text: '0'},