diff --git a/doc/latex/decls.tex b/doc/latex/decls.tex
index 620577b..873fcac 100644
--- a/doc/latex/decls.tex
+++ b/doc/latex/decls.tex
@@ -12,11 +12,11 @@
 \def\Unix{{Unix}} % Not smallcaps, according to Bart.
 \def\Scheme{{Scheme}}
 \def\scm{{Scheme 48}}
-\def\RnRS{R5RS\ }
+\def\RnRS{R5RS}
 \def\Posix{\textsc{Posix}}
 
-\def\sharpf{\normalfont\texttt{\#f}}
-\def\sharpt{\normalfont\texttt{\#t}}
+\def\sharpf{\textnormal{\texttt{\#f}}}
+\def\sharpt{\textnormal{\texttt{\#t}}}
 \newcommand{\synteq}{\textnormal{::=}}
 
 \def\maketildeother{\catcode`\~=12}
@@ -41,7 +41,6 @@
 % For multiletter vars in math mode:
 \newcommand{\var}[1]{\mbox{\frenchspacing\it{#1}}}
 \newcommand{\vari}[2]{\ensuremath{\mbox{\it{#1}}_{#2}}}
-\newcommand{\ovar}[1]{\mbox{\textnormal{[}\frenchspacing\it{#1}\textnormal{]}}}
 
 %% What you frequently want when you say \tt:
 \def\ttchars{\catcode``=13\@noligs\frenchspacing}
@@ -82,6 +81,8 @@
 
 \newcommand{\note}[1]{\{Note #1\}}
 
+\newcommand{\itum}[1]{\item{\bf #1}\\*}
+
 % For use in code. The \llap magicness makes the lambda exactly as wide as
 % the other chars in \tt; the \hskip shifts it right a bit so it doesn't
 % crowd the left paren -- which is necessary if \tt is cmtt.
@@ -128,6 +129,11 @@
 
 \newcommand{\keyword} [1]{\index{#1}{\normalfont\textsf{#1}}}
 
+% \ex{#1} and also generates an index entry.
+\newcommand{\exi}[1]{\index{#1@\texttt{#1}}\ex{#1}}
+\newcommand{\indextt}[1]{\index{#1@\texttt{#1}}}
+
+
 \newcommand{\evalto}{$\Longrightarrow$\ }
 \renewcommand{\star}{$^*$\/}
 \newcommand{\+}{$^+$}
@@ -136,7 +142,7 @@
 
 \newcommand{\sem}{\normalfont\itshape}   %semantic font
 \newcommand{\semvar}[1]{\textit{#1}}     %semantic font
-\newcommand{\synvar}[1]{\textrm{\textit{$<$#1$>$}}}  %syntactic font
+\newcommand{\synvar}[1]{\textrm{\textit{$\left<\right.$#1$\left.\right>$}}}  %syntactic font
 \newcommand{\type}{\sem}
 \newcommand{\zeroormore}[1]{{\sem #1$_1$ \ldots  #1$_n$}}
 \newcommand{\oneormore}[1]{{\sem #1$_1$ #1$_2$ \ldots #1$_n$}}
@@ -209,7 +215,7 @@
 \newcommand{\dfn}  {\par\medskip\dfnx}  % Takes 4 args, actually.
 \newcommand{\dfni} {\par\medskip\dfnix} % Takes 5 args, actually.
 
-\newcommand{\defvar}     {\par\medskip\defvarx} % Takes 2 args, actually.
+\newcommand{\defvar}     {\par\medskip\defvarx} % Takes 4 args, actually.
 \newcommand{\defvarx}[2]%
   {\index{#1}
    \hbox to \linewidth{\ttchars{{\ttt{#1}} \hfill #2}}}%
@@ -233,7 +239,7 @@
      \bgroup\begin{list}{}{\topsep=0pt\parskip=0pt}\item[]}
     {\end{list}\leavevmode\egroup\global\@ignoretrue}
 
-\newcommand{\defun}   [3] {\dfn{#1}{#2}{#3}{procedure}}  % preskip
+\def\defun#1#2#3{\dfn{#1}{#2}{#3}{procedure}}  % preskip
 \newcommand{\defunx}[3]{\dfnx{#1}{#2}{#3}{procedure}} % no skip
 
 \newenvironment{defundescx}[3]%
@@ -269,11 +275,4 @@
         {\begin{figure}[#1]\begin{boxedminipage}{\linewidth}\vskip 1.5ex}
         {\end{boxedminipage}\end{figure}}
 
-%FIXME-command: types out the desired FIXME
-\newcommand{\FIXME}[1]%
-{\typeout{**********************************}%
-\typeout{FIXME: #1}%
-\typeout{**********************************}}
-
-
 \makeatother
diff --git a/doc/latex/man.t2p b/doc/latex/man.t2p
index 7e0d2f9..e6a4e80 100644
--- a/doc/latex/man.t2p
+++ b/doc/latex/man.t2p
@@ -9,7 +9,7 @@
 % tex2page man
 
 \input css.t2p
-\dontuseimgforhtmlmath
+\htmlmathstyle{no-image}
 
 \let\pagebreak\relax
 
@@ -63,34 +63,41 @@
 
 \imgdef\vdots{\bf.\par.\par.}
 
-\evalh{
+%\evalh{
+%
+%(define all-blanks?
+%  (lambda (s)
+%    (andmap
+%      char-whitespace?
+%      (string->list s))))
+%
+%}
+%
+%
+%\def\spaceifnotempty{\evalh{
+%
+%(let ((x (ungroup (get-token))))
+%  (unless (all-blanks? x)
+%    (emit #\space)))
+%
+%}}
 
-(define all-blanks?
-  (lambda (s)
-    (andmap
-      char-whitespace?
-      (string->list s))))
-
-}
-
-
-\def\spaceifnotempty{\evalh{
-
-(let ((x (ungroup (get-token))))
-  (unless (all-blanks? x)
-    (emit #\space)))
-
-}}
+\def\spaceifnotempty#1{%
+  \def\TEMP{#1}%
+  \ifx\TEMP\empty\else\ \fi}
 
 \def\dfnix#1#2#3#4{\leftline{{\tt(#1\spaceifnotempty{#2}{\it#2})} \quad $\longrightarrow$ \quad {\it #3} \qquad (#4)} \index}
 
-\def\ex#1{{\tt #1}}
+%\def\ex#1{{\tt #1}}
+%\let\ex\texttt
 \def\l#1{lambda (#1)}
 \def\lx#1{lambda {#1}}
 %\def\notenum#1{}
 %\def\project#1{}
-\def\var#1{{\it #1\/}}
-\def\vari#1#2{\mbox{{\it #1\/}\undefcsactive\$$_{#2}$}}
+%\def\var#1{{\it #1\/}}
+%\let\var\textit
+%\def\vari#1#2{\mbox{{\it #1\/}\undefcsactive\$$_{#2}$}}
+%\def\vari#1#2{\textit{#1}$_{#2}$}
 
 \renewenvironment{boxedfigure}{\def\srecomment#1{\\#1\\}%
 \begin{figure}\pagestyle}{\end{figure}}
@@ -103,8 +110,8 @@
 \def\evalto{==> }%
 \defcsactive\%{\%}\obeywhitespace}
 
-\newenvironment{code}{\begin{quote}\bgroup\setupcode\GOBBLEOPTARG}
-{\egroup\end{quote}}
+\newenvironment{code}{\begin{quote}\setupcode\GOBBLEOPTARG}
+{\end{quote}}
 
 \newenvironment{codebox}{\begin{tableplain}\bgroup\setupcode\GOBBLEOPTARG}
 {\egroup\end{tableplain}}
@@ -123,4 +130,4 @@
 \renewenvironment{leftinset}{\begin{quote}}{\end{quote}}
 \renewenvironment{tightinset}{\begin{quote}}{\end{quote}}
 \renewenvironment{tightleftinset}{\begin{quote}}{\end{quote}}
-}
\ No newline at end of file
+}