@@ -72,8 +72,8 @@
 \indextext{\idxcode{switch}!and try block}%
 \indextext{\idxcode{goto}!and handler}%
 \indextext{\idxcode{switch}!and handler}%
-A \tcode{goto} or \keyword{switch} statement shall not be used to transfer control
-into a try block or into a handler.
+The \grammarterm{compound-statement} of a try block or of a handler is a
+control-flow-limited statement\iref{stmt.label}.
 \begin{example}
 \begin{codeblock}
 void f() {
 
@@ -152,6 +152,18 @@
 \indextext{label!\idxcode{default}}%
 Case labels and default labels shall occur only in \keyword{switch} statements.
 
+\pnum
+A \defnadj{control-flow-limited}{statement} is a statement \tcode{S} for which:
+\begin{itemize}
+\item
+  a \keyword{case} or \keyword{default} label appearing within \tcode{S} shall
+  be associated with a \keyword{switch} statement\iref{stmt.switch} within
+  \tcode{S}, and
+\item
+  a label declared in \tcode{S} shall only be referred to by a
+  statement\iref{stmt.goto} in \tcode{S}.
+\end{itemize}
+
 
 \rSec1[stmt.expr]{Expression statement}%
 \indextext{statement!expression}
@@ -277,6 +289,8 @@
 enclosing templated entity\iref{temp.pre}, if the condition is
 not value-dependent after its instantiation, the discarded substatement
 (if any) is not instantiated.
+Each substatement of a constexpr if statement is a control-flow-limited
+statement\iref{stmt.label}.
 \begin{example}
 \begin{codeblock}
 if constexpr (sizeof(int[2])) {}        // OK, narrowing allowed
@@ -286,12 +300,6 @@
 Odr-uses\iref{term.odr.use} in a discarded statement do not require
 an entity to be defined.
 \end{note}
-A \keyword{case} or \keyword{default} label appearing within such an
-\keyword{if} statement shall be associated with a \keyword{switch}
-statement\iref{stmt.switch} within the same \keyword{if} statement.
-A label\iref{stmt.label} declared in a substatement of a constexpr if
-statement shall only be referred to by a statement\iref{stmt.goto} in
-the same substatement.
 \begin{example}
 \begin{codeblock}
 template<typename T, typename ... Rest> void g(T&& p, Rest&& ...rs) {
@@ -364,12 +372,8 @@
 \end{note}
 Otherwise, if the \keyword{else} part of the selection statement is present,
 then the second substatement is executed.
-A \keyword{case} or \keyword{default} label
-appearing within such an \keyword{if} statement
-shall be associated with a \keyword{switch} statement
-within the same \keyword{if} statement.
-A label declared in a substatement of a consteval if statement
-shall only be referred to by a statement in the same substatement.
+Each substatement of a consteval if statement is a control-flow-limited
+statement\iref{stmt.label}.
 
 \pnum
 An \keyword{if} statement of the form