diff --git a/source/macros.tex b/source/macros.tex
index ae5591106e..f47b65301b 100644
--- a/source/macros.tex
+++ b/source/macros.tex
@@ -406,8 +406,10 @@
 \ExplSyntaxOff
 
 %% Inline non-parenthesized table reference (override memoir's \tref)
+\providecommand{\tref}{}
 \renewcommand{\tref}[1]{\hyperref[tab:#1]{\tablerefname \nolinebreak[3] \ref*{tab:#1}}}
 %% Inline non-parenthesized figure reference (override memoir's \fref)
+\providecommand{\fref}{}
 \renewcommand{\fref}[1]{\hyperref[fig:#1]{\figurerefname \nolinebreak[3] \ref*{fig:#1}}}
 
 %% NTBS, etc.
diff --git a/source/text.tex b/source/text.tex
index b89eaa3ea4..d5bed79236 100644
--- a/source/text.tex
+++ b/source/text.tex
@@ -1305,7 +1305,7 @@
 
 \pnum
 The \tcode{put()} members make no provision for error reporting.
-(Any failures of the OutputIterator argument can be extracted from
+(Any failures of the \tcode{OutputIterator} argument can be extracted from
 the returned iterator.)
 The \tcode{get()} members take an \tcode{ios_base::iostate\&} argument
 whose value they ignore,
@@ -5698,7 +5698,7 @@
 The \tcode{text_encoding::id} enumeration
 contains an enumerator for each known registered character encoding.
 For each encoding, the corresponding enumerator is derived from
-the alias beginning with ``\tcode{cs}'', as follows
+the alias beginning with ``\tcode{cs}'', as follows:
 \begin{itemize}
 \item
 \tcode{csUnicode} is mapped to \tcode{text_encoding::id::UCS2},
diff --git a/tools/check-output.sh b/tools/check-output.sh
index a28d236e0c..61d8310323 100755
--- a/tools/check-output.sh
+++ b/tools/check-output.sh
@@ -46,7 +46,7 @@ cat std-grammarindex.ind |
     awk 'BEGIN { def=1 } /^  .item/ { if (def==0) { gsub("[{},]", "", item); print item } item=$NF; def=0; next } /hyperindexformat/ { def=1 }' |
     grep -v -- '-keyword$' |    # xxx-keyword is special
     sed 's/^\(.*\)$/grammar non-terminal \1 has no definition/' |
-    fail || failed=1
+    fail || { cat std-grammarindex.ind; failed=1; }
 
 # Find header index entries missing a definition
 cat std-headerindex.ind |