Index: doc/theses/andrew_beach_MMath/cfalab.sty
===================================================================
--- doc/theses/andrew_beach_MMath/cfalab.sty	(revision a6c45c6127052add9b2043d7186d1f3f7c51f00c)
+++ doc/theses/andrew_beach_MMath/cfalab.sty	(revision a049412a2657de5d2f5ce5ca550ac2aaaf660f5c)
@@ -1,5 +1,6 @@
 % Package for CFA Research Lab.
 %
-% Made by combining and updating various macro files people had made.
+% This is a collection of commands everyone working on CFA related documents
+% should find useful. So mostly programming language related tools.
 %
 % Internal commands are prefixed with "\cfalab@".
@@ -17,22 +18,13 @@
 % Automatically adds spaces.
 \RequirePackage{xspace}
-% Improved reference tools.
-\RequirePackage[nospace]{varioref}
 
-% Symbols: All symbols are zero argument robust commands with special rules
-% about the space following the c.s. token. Normally the space might be
-% re-added according to the rules of the xspace package. They may be followed
-% by a star (which the command will consume) to disable this behaviour.
-
-% \newsymbolcmd{<command>}{<replacement text>}
-% Defines <command> to be a symbol that has the given <replacement text>.
-\newrobustcmd*\newsymbolcmd[2]{\newrobustcmd{#1}{\cfalab@symbol{#2}}}
-\def\cfalab@symbol#1{\@ifnextchar*{#1\cfalab@eatstar}{#1\xspace}}
-\def\cfalab@eatstar*{}
-
+% Tip for commands that end with \xspace: if the default is not correct then
+% follow the command with {} to disable \xspace, use '{} ' to force add a
+% space and '{}<whatever-follows>' to force remove one.
+%
 % Cforall with the forall symbol.
-\newsymbolcmd\CFA{\textsf{C}\raisebox{\depth}{\rotatebox{180}{\textsf{A}}}}
-% C++ with kerning. (No standard number support.)
-\newsymbolcmd\Cpp{\textrm{C}\kern-.1em\hbox{+\kern-.25em+}}
+\newrobustcmd\CFA{\textsf{C\raisebox{\depth}{\rotatebox{180}{A}}}\xspace}
+% C++ with kerning. You may optionally append a standard number.
+\newrobustcmd\Cpp[1][\xspace]{C++#1}
 
 % This is executed very early in the \begin{document} code, before the
Index: doc/theses/andrew_beach_MMath/uw-ethesis.tex
===================================================================
--- doc/theses/andrew_beach_MMath/uw-ethesis.tex	(revision a6c45c6127052add9b2043d7186d1f3f7c51f00c)
+++ doc/theses/andrew_beach_MMath/uw-ethesis.tex	(revision a049412a2657de5d2f5ce5ca550ac2aaaf660f5c)
@@ -97,4 +97,6 @@
 % cfa macros used in the document
 \usepackage{cfalab}
+% Improved reference tools.
+\usepackage[nospace]{varioref}
 
 % Hyperlinks make it very easy to navigate an electronic document.