Index: doc/papers/general/Paper.tex
===================================================================
--- doc/papers/general/Paper.tex	(revision d03fa6d2b592bc1c03258a84dc1546317a6f8f84)
+++ doc/papers/general/Paper.tex	(revision 51b5a02b51fd118d11eface4ca0b51817b8e31bd)
@@ -130,8 +130,8 @@
 
 \lstnewenvironment{cfa}[1][]
-{\CFA\lstset{#1}}
+{\lstset{#1}}
 {}
 \lstnewenvironment{C++}[1][]                            % use C++ style
-{\lstset{language=C++,moredelim=**[is][\protect\color{red}]{`}{`},#1}}
+{\lstset{language=C++,moredelim=**[is][\protect\color{red}]{`}{`},#1}\lstset{#1}}
 {}
 
@@ -946,5 +946,5 @@
 \begin{tabular}{@{\hspace{\parindentlnth}}l@{\hspace{\parindentlnth}}l@{\hspace{\parindentlnth}}l@{}}
 \multicolumn{1}{@{\hspace{\parindentlnth}}c@{\hspace{\parindentlnth}}}{\textbf{\CFA}}	& \multicolumn{1}{@{\hspace{\parindentlnth}}c}{\textbf{C}}	\\
-\begin{lstlisting}
+\begin{cfa}
 `LC:` {
 	... $declarations$ ...
@@ -968,7 +968,7 @@
 	} // switch
 } // compound
-\end{lstlisting}
+\end{cfa}
 &
-\begin{lstlisting}
+\begin{cfa}
 {
 	... $declarations$ ...
@@ -992,7 +992,7 @@
 	} `LS:` ;
 } `LC:` ;
-\end{lstlisting}
+\end{cfa}
 &
-\begin{lstlisting}
+\begin{cfa}
 
 
@@ -1016,5 +1016,5 @@
 
 
-\end{lstlisting}
+\end{cfa}
 \end{tabular}
 \lstMakeShortInline@%
@@ -1055,10 +1055,10 @@
 	int i, j;
 	int mem() {					$\C{\color{red}// implicit "this" parameter}$
-		i = 1;					$\C{\color{red}// this->i}$
-		j = 2;					$\C{\color{red}// this->j}$
+		i = 1;					$\C{\color{red}// this-{\textgreater}i}$
+		j = 2;					$\C{\color{red}// this-{\textgreater}j}$
 	}
 }
 \end{C++}
-Since CFA is non-object-oriented, the equivalent object-oriented program looks like:
+Since \CFA is non-object-oriented, the equivalent object-oriented program looks like:
 \begin{cfa}
 struct S { int i, j; };
@@ -1188,5 +1188,5 @@
 
 {\lstset{language=CFA,deletedelim=**[is][]{`}{`},moredelim=**[is][\color{red}]{@}{@}}
-\begin{lstlisting}
+\begin{cfa}
 struct Weight { double stones; };
 
@@ -1208,5 +1208,5 @@
 	w = 5@`st@ + 8@`kg@ + 25@`lb@ + hw;
 }
-\end{lstlisting}
+\end{cfa}
 }%