diff --git a/source/basic.tex b/source/basic.tex
index 65947ad304..ed92d9bb77 100644
--- a/source/basic.tex
+++ b/source/basic.tex
@@ -3816,7 +3816,6 @@
 \rSec3[basic.stc.static]{Static storage duration}
 
 \pnum
-\indextext{storage duration!static}%
 All variables which
 \begin{itemize}
 \item
@@ -3826,7 +3825,7 @@
 are first declared with
 the \keyword{static} or \keyword{extern} keywords\iref{dcl.stc}
 \end{itemize}
-have \defn{static storage duration}.
+have \defnadj{static}{storage duration}.
 The storage for these entities lasts for the duration of the
 program\iref{basic.start.static,basic.start.term}.
 
diff --git a/source/classes.tex b/source/classes.tex
index 4ec1a5409e..85a4b646e4 100644
--- a/source/classes.tex
+++ b/source/classes.tex
@@ -63,7 +63,7 @@
 a partial specialization\iref{temp.spec.partial}.
 A \grammarterm{class-specifier} whose
 \grammarterm{class-head} omits the
-\grammarterm{class-head-name} defines an unnamed class.
+\grammarterm{class-head-name} defines an \defnadj{unnamed}{class}.
 \begin{note}
 An unnamed class thus can't
 be \tcode{final}.
@@ -2779,9 +2779,8 @@
 \end{note}
 
 \pnum
-\indextext{bit-field!unnamed}%
 A declaration for a bit-field that omits the \grammarterm{identifier}
-declares an \defn{unnamed bit-field}. Unnamed bit-fields are not
+declares an \defnadj{unnamed}{bit-field}. Unnamed bit-fields are not
 members and cannot be initialized.
 An unnamed bit-field shall not be declared with a cv-qualified type.
 \begin{note}
diff --git a/source/statements.tex b/source/statements.tex
index 4f0c773c51..4c8bef837e 100644
--- a/source/statements.tex
+++ b/source/statements.tex
@@ -187,10 +187,9 @@
 \indextext{side effects}%
 side effects from an expression statement
 are completed before the next statement is executed.
-\indextext{statement!null}%
 \indextext{statement!empty}%
 An expression statement with the expression missing is called
-a \defn{null statement}.
+a \defnadj{null}{statement}.
 \begin{note}
 Most statements are expression statements --- usually assignments or
 function calls. A null statement is useful to supply a null body to an