Index: doc/theses/andrew_beach_MMath/cfalab.sty
===================================================================
--- doc/theses/andrew_beach_MMath/cfalab.sty	(revision 9d7e5cb8d333e693f8ced35925a418c730d01e1a)
+++ doc/theses/andrew_beach_MMath/cfalab.sty	(revision fc1347d0307b24d6841b90f1cee2e3c16d759e52)
@@ -48,13 +48,4 @@
 \newcommand*\colour[2]{{\color{#1}#2}}
 
-% \codeCFA{<code>}
-% \codeC{<code>}
-% \codeCpp{<code>}
-% \codePy{<code>}
-% Use the listings package to format a snipit of <code>.
-\newrobustcmd*\codeCFA[1]{\lstinline[language=CFA]{#1}}
-\newrobustcmd*\codeC[1]{\lstinline[language=C]{#1}}
-\newrobustcmd*\codeCpp[1]{\lstinline[language=C++]{#1}}
-\newrobustcmd*\codePy[1]{\lstinline[language=Python]{#1}}
 % \code{<language>}{<code>}
 % Use the listings package to format the snipit of <code> in <language>.
Index: doc/theses/andrew_beach_MMath/features.tex
===================================================================
--- doc/theses/andrew_beach_MMath/features.tex	(revision 9d7e5cb8d333e693f8ced35925a418c730d01e1a)
+++ doc/theses/andrew_beach_MMath/features.tex	(revision fc1347d0307b24d6841b90f1cee2e3c16d759e52)
@@ -24,7 +24,7 @@
 
 Some well known examples include the @throw@ statements of \Cpp and Java and
-the \codePy{raise} statement from Python. In real systems a raise may preform
-some other work (such as memory management) but for the purposes of this
-overview that can be ignored.
+the \code{Python}{raise} statement from Python. In real systems a raise may
+preform some other work (such as memory management) but for the
+purposes of this overview that can be ignored.
 
 \subparagraph{Handle}
@@ -93,5 +93,5 @@
 A handler labelled with any given exception can handle exceptions of that
 type or any child type of that exception. The root of the exception hierarchy
-(here \codeC{exception}) acts as a catch-all, leaf types catch single types
+(here \code{C}{exception}) acts as a catch-all, leaf types catch single types
 and the exceptions in the middle can be used to catch different groups of
 related exceptions.
@@ -182,5 +182,5 @@
 While much of the virtual infrastructure is created, it is currently only used
 internally for exception handling. The only user-level feature is the virtual
-cast, which is the same as the \Cpp \codeCpp{dynamic_cast}.
+cast, which is the same as the \Cpp \code{C++}{dynamic_cast}.
 \label{p:VirtualCast}
 \begin{cfa}
Index: doc/theses/andrew_beach_MMath/uw-ethesis.tex
===================================================================
--- doc/theses/andrew_beach_MMath/uw-ethesis.tex	(revision 9d7e5cb8d333e693f8ced35925a418c730d01e1a)
+++ doc/theses/andrew_beach_MMath/uw-ethesis.tex	(revision fc1347d0307b24d6841b90f1cee2e3c16d759e52)
@@ -145,5 +145,5 @@
 
 % Exception to the rule of hyperref being the last add-on package
-\usepackage[automake,toc,abbreviations]{glossaries-extra}
+\usepackage[toc,abbreviations]{glossaries-extra}
 % If glossaries-extra is not in your LaTeX distribution, get it from CTAN
 % (http://ctan.org/pkg/glossaries-extra), although it's supposed to be in