diff --git a/source/basic.tex b/source/basic.tex
index 3b24b0a72b..f4b83df601 100644
--- a/source/basic.tex
+++ b/source/basic.tex
@@ -1010,7 +1010,7 @@
 
 \pnum
 \indextext{scope!block}%
-\indextext{local scope|see{block scope}}%
+\indextext{local scope|see{scope, block}}%
 A name declared in a block\iref{stmt.block} is local to that block; it has
 \defnx{block scope}{block (statement)!scope}.
 Its potential scope begins at its point of
diff --git a/source/classes.tex b/source/classes.tex
index 9fb117358a..537f0de2a3 100644
--- a/source/classes.tex
+++ b/source/classes.tex
@@ -3563,7 +3563,8 @@
 derived object\iref{intro.object} is unspecified.
 \begin{note}
 \indextext{directed acyclic graph|see{DAG}}%
-\indextext{lattice|see{DAG, subobject}}%
+\indextext{lattice|see{DAG}}%
+\indextext{lattice|see{subobject}}%
 A derived class and its base class subobjects can be represented by a
 directed acyclic graph (DAG) where an arrow means ``directly derived
 from'' (see \fref{class.dag}).
diff --git a/source/declarations.tex b/source/declarations.tex
index 22e0824e7d..3a3cce904f 100644
--- a/source/declarations.tex
+++ b/source/declarations.tex
@@ -501,7 +501,10 @@
 
 \rSec2[dcl.fct.spec]{Function specifiers}%
 \indextext{specifier!function}%
-\indextext{function|seealso{friend function; member function; inline function; virtual function}}
+\indextext{function|seealso{friend function}}
+\indextext{function|seealso{member function}}
+\indextext{function|seealso{inline function}}
+\indextext{function|seealso{virtual function}}
 
 \pnum
 A
diff --git a/source/preprocessor.tex b/source/preprocessor.tex
index 50e1146b30..5fb18c0b19 100644
--- a/source/preprocessor.tex
+++ b/source/preprocessor.tex
@@ -598,7 +598,7 @@
 \rSec1[cpp.include]{Source file inclusion}
 \indextext{preprocessing directive!header inclusion}
 \indextext{preprocessing directive!source-file inclusion}
-\indextext{inclusion!source file|see{preprocessing directives, source-file inclusion}}%
+\indextext{inclusion!source file|see{preprocessing directive, source-file inclusion}}%
 \indextext{\idxcode{\#include}}%
 
 \pnum
@@ -1525,7 +1525,7 @@
 
 \rSec1[cpp.line]{Line control}%
 \indextext{preprocessing directive!line control}%
-\indextext{\idxcode{\#line}|see{preprocessing directives, line control}}
+\indextext{\idxcode{\#line}|see{preprocessing directive, line control}}
 
 \pnum
 The \grammarterm{string-literal} of a
@@ -1581,7 +1581,7 @@
 
 \rSec1[cpp.error]{Error directive}%
 \indextext{preprocessing directive!error}%
-\indextext{\idxcode{\#error}|see{preprocessing directives, error}}
+\indextext{\idxcode{\#error}|see{preprocessing directive, error}}
 
 \pnum
 A preprocessing directive of the form
@@ -1594,7 +1594,7 @@
 
 \rSec1[cpp.pragma]{Pragma directive}%
 \indextext{preprocessing directive!pragma}%
-\indextext{\idxcode{\#pragma}|see{preprocessing directives, pragma}}
+\indextext{\idxcode{\#pragma}|see{preprocessing directive, pragma}}
 
 \pnum
 A preprocessing directive of the form
diff --git a/source/templates.tex b/source/templates.tex
index 8db57d6312..4b85c2c63c 100644
--- a/source/templates.tex
+++ b/source/templates.tex
@@ -3816,7 +3816,7 @@
 the same set of template argument lists.
 
 \pnum
-\indextext{template!function!equivalent|see{equivalent, function template}}%
+\indextext{template!function!equivalent|see{equivalent, function templates}}%
 Two function templates are
 \defnx{equivalent}{equivalent!function templates}
 if they
@@ -3830,7 +3830,7 @@
 expressions involving
 template parameters.
 \indextext{equivalent!functionally|see{functionally equivalent}}%
-\indextext{template!function!functionally equivalent|see{functionally equivalent, function template}}%
+\indextext{template!function!functionally equivalent|see{functionally equivalent, function templates}}%
 Two function templates are
 \defnx{functionally equivalent}{functionally equivalent!function templates}
 if they
diff --git a/source/threads.tex b/source/threads.tex
index 4315b558ae..6b8a2ec342 100644
--- a/source/threads.tex
+++ b/source/threads.tex
@@ -5555,7 +5555,7 @@
   the next phase starts.
 \end{itemize}
 
-\indextext{phase synchronization point|see{barrier, phase synchronization point }}%
+\indextext{phase synchronization point|see{barrier, phase synchronization point}}%
 \pnum
 \indextext{block (execution)}%
 Each phase defines a \defnx{phase synchronization point}{barrier!phase synchronization point}.