Index: doc/theses/andrew_beach_MMath/implement.tex
===================================================================
--- doc/theses/andrew_beach_MMath/implement.tex	(revision cd03b76d2be3680d03e99bc17ed4afd74cb2e0b3)
+++ doc/theses/andrew_beach_MMath/implement.tex	(revision 25d4e153d01ba0dde134cb98245def87984aad16)
@@ -673,5 +673,5 @@
 \newsavebox{\stackBox}
 \begin{lrbox}{\codeBox}
-\begin{lstlisting}[language=CFA,{moredelim=**[is][\color{red}]{@}{@}}]
+\begin{cfa}
 unsigned num_exceptions = 0;
 void throws() {
@@ -692,17 +692,17 @@
     throws();
 }
-\end{lstlisting}
+\end{cfa}
 \end{lrbox}
 
 \begin{lrbox}{\stackBox}
 \begin{lstlisting}
-| try-finally
-| try-catch (Example)
+| finally block (Example)
+| try block
 throws()
-| try-finally
-| try-catch (Example)
+| finally block (Example)
+| try block
 throws()
-| try-finally
-| try-catch (Example)
+| finally block (Example)
+| try block
 throws()
 main()
@@ -960,5 +960,4 @@
 \caption{Resumption Marking}
 \label{f:ResumptionMarking}
-\todo*{Label Resumption Marking to aid clarity.}
 \end{figure}
 
Index: doc/theses/andrew_beach_MMath/performance.tex
===================================================================
--- doc/theses/andrew_beach_MMath/performance.tex	(revision cd03b76d2be3680d03e99bc17ed4afd74cb2e0b3)
+++ doc/theses/andrew_beach_MMath/performance.tex	(revision 25d4e153d01ba0dde134cb98245def87984aad16)
@@ -350,5 +350,4 @@
 finally clauses seem to avoid the spike that run-time destructors have.
 Possibly some optimization removes the cost of changing contexts.
-\todo{OK, I think the finally clause may have been optimized out.}
 
 \item[Other Traversal]
@@ -361,5 +360,4 @@
 but they could avoid the spike by not having the same kind of overhead for
 switching to the check's context.
-\todo{Could revisit Other Traversal, after Finally Traversal.}
 
 \item[Cross Handler]
Index: doc/theses/andrew_beach_MMath/resumption-marking.fig
===================================================================
--- doc/theses/andrew_beach_MMath/resumption-marking.fig	(revision cd03b76d2be3680d03e99bc17ed4afd74cb2e0b3)
+++ doc/theses/andrew_beach_MMath/resumption-marking.fig	(revision 25d4e153d01ba0dde134cb98245def87984aad16)
@@ -32,16 +32,4 @@
 2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2
 	1 1 1.00 60.00 120.00
-	 2205 1620 1845 1620
-2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2
-	1 1 1.00 60.00 120.00
-	 3735 2340 3375 2340
-2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2
-	1 1 1.00 60.00 120.00
-	 5445 945 5085 945
-2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2
-	1 1 1.00 60.00 120.00
-	 7065 1620 6705 1620
-2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2
-	1 1 1.00 60.00 120.00
 	 1665 1755 1665 2205
 2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2
@@ -60,12 +48,40 @@
 	1 1 1.00 60.00 120.00
 	 6525 2475 6525 2925
-4 1 0 50 -1 0 12 0.0000 0 135 945 1665 3375 Initial State\001
-4 1 0 50 -1 0 12 0.0000 0 135 1215 3195 3375 Found Handler\001
-4 1 0 50 -1 0 12 0.0000 0 180 1605 6570 3375 Handling Complete\001
-4 0 0 50 -1 0 12 0.0000 0 135 390 3825 2385 head\001
-4 0 0 50 -1 0 12 0.0000 0 135 390 5535 990 head\001
-4 0 0 50 -1 0 12 0.0000 0 135 390 7155 1665 head\001
-4 2 0 50 -1 0 12 0.0000 0 135 690 1485 2385 handlers\001
-4 1 0 50 -1 0 12 0.0000 0 135 855 4905 3375 Handler in\001
-4 1 0 50 -1 0 12 0.0000 0 180 795 4905 3600 Try block\001
-4 0 0 50 -1 0 12 0.0000 0 135 390 2295 1665 head\001
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2
+	1 1 1.00 60.00 120.00
+	 1260 1620 1485 1620
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2
+	1 1 1.00 60.00 120.00
+	 1980 1440 1755 1440
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2
+	1 1 1.00 60.00 120.00
+	 2790 2340 3015 2340
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2
+	1 1 1.00 60.00 120.00
+	 3600 1620 3375 1620
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2
+	1 1 1.00 60.00 120.00
+	 4500 945 4725 945
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2
+	1 1 1.00 60.00 120.00
+	 5265 765 5040 765
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2
+	1 1 1.00 60.00 120.00
+	 6120 1620 6345 1620
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2
+	1 1 1.00 60.00 120.00
+	 6840 1440 6615 1440
+4 1 0 50 -1 0 12 0.0000 0 135 1170 1665 3375 Initial State\001
+4 1 0 50 -1 0 12 0.0000 0 135 1170 3195 3375 Found Handler\001
+4 1 0 50 -1 0 12 0.0000 0 165 1530 6570 3375 Handling Complete\001
+4 2 0 50 -1 0 12 0.0000 0 135 720 1485 2385 handlers\001
+4 1 0 50 -1 0 12 0.0000 0 135 900 4905 3375 Handler in\001
+4 1 0 50 -1 0 12 0.0000 0 165 810 4905 3600 Try block\001
+4 0 0 50 -1 0 12 0.0000 0 135 360 855 1665 head\001
+4 0 0 50 -1 0 12 0.0000 4 120 810 2025 1485 execution\001
+4 0 0 50 -1 0 12 0.0000 0 135 360 2385 2385 head\001
+4 0 0 50 -1 0 12 0.0000 4 120 810 3645 1665 execution\001
+4 0 0 50 -1 0 12 0.0000 0 135 360 4095 990 head\001
+4 0 0 50 -1 0 12 0.0000 4 120 810 5310 810 execution\001
+4 0 0 50 -1 0 12 0.0000 0 135 360 5715 1665 head\001
+4 0 0 50 -1 0 12 0.0000 4 120 810 6885 1485 execution\001