diff --git a/source/basic.tex b/source/basic.tex
index 36ca7eeac8..ecd40ef475 100644
--- a/source/basic.tex
+++ b/source/basic.tex
@@ -274,7 +274,7 @@
 \item it is
 an explicit instantiation declaration\iref{temp.explicit}, or
 \item it is
-an explicit specialization\iref{temp.expl.spec} whose
+an \grammarterm{explicit-specialization}\iref{temp.expl.spec} whose
 \grammarterm{declaration} is not a definition.
 \end{itemize}
 A declaration is said to be a \defn{definition} of each entity that it defines.
@@ -999,7 +999,7 @@
 Corresponding declarations with appropriate linkage
 declare the same entity\iref{basic.link}.
 \item
-The declaration in a \grammarterm{template-declaration}
+The \grammarterm{declaration} of a \grammarterm{template-declaration}
 inhabits the same scope as the \grammarterm{template-declaration}.
 \item
 Friend declarations and
diff --git a/source/declarations.tex b/source/declarations.tex
index 42027658b5..16e67743c8 100644
--- a/source/declarations.tex
+++ b/source/declarations.tex
@@ -532,10 +532,10 @@
 \grammarterm{storage-class-specifier}
 appears in a \grammarterm{decl-specifier-seq}, there can be no
 \tcode{typedef} specifier in the same \grammarterm{decl-specifier-seq} and
-the \grammarterm{init-declarator-list} or \grammarterm{member-declarator-list}
-of the declaration shall not be
-empty (except for an anonymous union declared in a namespace scope\iref{class.union.anon}). The
-\grammarterm{storage-class-specifier} applies to the name declared by each
+the \grammarterm{init-declarator-list} of the \grammarterm{simple-declaration} or
+the \grammarterm{member-declarator-list} of the \grammarterm{member-declaration}
+shall not be empty (except for an anonymous union declared in a namespace scope\iref{class.union.anon}).
+The \grammarterm{storage-class-specifier} applies to the name declared by each
 \grammarterm{init-declarator} in the list and not to any names declared by
 other specifiers.
 \begin{note}
@@ -1258,9 +1258,10 @@
 There are two \grammarterm{cv-qualifier}{s}, \keyword{const} and
 \tcode{volatile}. Each \grammarterm{cv-qualifier} shall appear at most once in
 a \grammarterm{cv-qualifier-seq}. If a \grammarterm{cv-qualifier} appears in a
-\grammarterm{decl-specifier-seq}, the \grammarterm{init-declarator-list}
-or \grammarterm{member-declarator-list} of
-the declaration shall not be empty.
+\grammarterm{decl-specifier-seq},
+the \grammarterm{init-declarator-list} of the \grammarterm{simple-declaration} or
+the \grammarterm{member-declarator-list} of the \grammarterm{member-declaration}
+shall not be empty.
 \begin{note}
 \ref{basic.type.qualifier} and \ref{dcl.fct} describe how cv-qualifiers affect object and
 function types.
@@ -2409,8 +2410,10 @@
 \end{note}
 
 \pnum
-Each \grammarterm{init-declarator} or \grammarterm{member-declarator}
-in a declaration is analyzed separately as if it were in a declaration by itself.
+Each \grammarterm{init-declarator} of a \grammarterm{simple-declaration}
+or \grammarterm{member-declarator} of a \grammarterm{member-declaration}
+is analyzed separately as if it were in a
+\grammarterm{simple-declaration} or \grammarterm{member-declaration} by itself.
 \begin{note}
 A declaration with several declarators is usually equivalent to the corresponding
 sequence of declarations each with a single declarator. That is,
@@ -2945,7 +2948,7 @@
 specifier
 or an \grammarterm{explicit-specifier}
 applies directly to each \grammarterm{declarator-id}
-in a declaration;
+in a \grammarterm{simple-declaration} or \grammarterm{member-declaration};
 the type specified for each \grammarterm{declarator-id} depends on
 both the \grammarterm{decl-specifier-seq} and its \grammarterm{declarator}.
 
diff --git a/source/statements.tex b/source/statements.tex
index 9163c1916a..c574ea0bd8 100644
--- a/source/statements.tex
+++ b/source/statements.tex
@@ -262,7 +262,6 @@
 \pnum
 \begin{note}
 A compound statement defines a block scope\iref{basic.scope}.
-A declaration is a \grammarterm{statement}\iref{stmt.dcl}.
 \end{note}
 
 \rSec1[stmt.select]{Selection statements}%
@@ -932,7 +931,7 @@
   @\grammarterm{compound-statement}@
 }
 \end{codeblock}
-The keyword \keyword{constexpr} is present in the declaration
+The keyword \keyword{constexpr} is present in the \grammarterm{structured-binding-declaration}
 of $u_{0}, u_{1}, \dotsc, u_{N-1}$ if and only if
 \keyword{constexpr} is one of the \grammarterm{decl-specifier}s
 of the \grammarterm{decl-specifier-seq}