Index: doc/papers/general/Paper.tex
===================================================================
--- doc/papers/general/Paper.tex	(revision 000ff2c54a34aa561f154b1505eebc17721c3c0d)
+++ doc/papers/general/Paper.tex	(revision 0a2168f70d19fcd419798e37c616d95122265421)
@@ -13,4 +13,6 @@
 \usepackage{pslatex}						% reduce size of san serif font
 \usepackage[plainpages=false,pdfpagelabels,pdfpagemode=UseNone,pagebackref=true,breaklinks=true,colorlinks=true,linkcolor=blue,citecolor=blue,urlcolor=blue]{hyperref}
+\urlstyle{sf}
+\usepackage{breakurl}
 
 \setlength{\textheight}{9in}
@@ -2020,25 +2022,25 @@
 \begin{tabular}{@{}l@{\hspace{\parindentlnth}}l@{\hspace{\parindentlnth}}l@{}}
 \begin{cfa}
-20_hh     // signed char
-21_hhu   // unsigned char
-22_h      // signed short int
-23_uh    // unsigned short int
-24z        // size_t
-\end{cfa}
-&
-\begin{cfa}
-20_L8     // int8_t
-21_ul8    // uint8_t
-22_l16    // int16_t
-23_ul16  // uint16_t
-24_l32    // int32_t
-\end{cfa}
-&
-\begin{cfa}
-25_ul32      // uint32_t
-26_l64        // int64_t
-27_l64u      // uint64_t
-26_L128     // int128
-27_L128u  // unsigned int128
+20`_hh`     // signed char
+21`_hhu`   // unsigned char
+22`_h`       // signed short int
+23`_uh`     // unsigned short int
+24`z`         // size_t
+\end{cfa}
+&
+\begin{cfa}
+20`_L8`      // int8_t
+21`_ul8`     // uint8_t
+22`_l16`     // int16_t
+23`_ul16`   // uint16_t
+24`_l32`     // int32_t
+\end{cfa}
+&
+\begin{cfa}
+25`_ul32`      // uint32_t
+26`_l64`        // int64_t
+27`_l64u`      // uint64_t
+26`_L128`     // int128
+27`_L128u`   // unsigned int128
 \end{cfa}
 \end{tabular}
@@ -2465,13 +2467,13 @@
 	ofstream out = { "cfa-out.txt" };
 	int max = 0, val = 42;
-	stack( int ) si, t;
-
-	REPEAT_TIMED( "push_int", N, push( si, val ); )
-	TIMED( "copy_int", t = si; )
-	TIMED( "clear_int", clear( si ); )
+	stack( int ) s, t;
+
+	REPEAT_TIMED( "push_int", N, push( s, val ); )
+	TIMED( "copy_int", t = s; )
+	TIMED( "clear_int", clear( s ); )
 	REPEAT_TIMED( "pop_int", N, int x = pop( t ); max = max( x, max ); )
 	REPEAT_TIMED( "print_int", N/2, out | val | ':' | val | endl; )
 
-	pair( _Bool, char ) max = { (_Bool)0, '\0' }, val = { (_Bool)1, 'a' };
+	pair( _Bool, char ) max = { false, '\0' }, val = { true, 'a' };
 	stack( pair( _Bool, char ) ) s, t;
 
@@ -2634,5 +2636,6 @@
 
 The authors would like to recognize the design assistance of Glen Ditchfield, Richard Bilson, and Thierry Delisle on the features described in this paper, and thank Magnus Madsen for feedback in the writing.
-%This work is supported in part by a corporate partnership with \grantsponsor{Huawei}{Huawei Ltd.}{http://www.huawei.com}, and Aaron Moss and Peter Buhr are funded by the \grantsponsor{Natural Sciences and Engineering Research Council} of Canada.
+This work is supported through a corporate partnership with Huawei Ltd.\ (\url{http://www.huawei.com}), and Aaron Moss and Peter Buhr are funded by the Natural Sciences and Engineering Research Council of Canada.
+
 % the first author's \grantsponsor{NSERC-PGS}{NSERC PGS D}{http://www.nserc-crsng.gc.ca/Students-Etudiants/PG-CS/BellandPostgrad-BelletSuperieures_eng.asp} scholarship.
 
Index: doc/papers/general/evaluation/cfa-bench.c
===================================================================
--- doc/papers/general/evaluation/cfa-bench.c	(revision 000ff2c54a34aa561f154b1505eebc17721c3c0d)
+++ doc/papers/general/evaluation/cfa-bench.c	(revision 0a2168f70d19fcd419798e37c616d95122265421)
@@ -1,4 +1,5 @@
 #include <fstream>
 #include <stdlib>
+#include <stdbool.h>
 #include "bench.h"
 #include "cfa-stack.h"
@@ -9,13 +10,13 @@
 	ofstream out = { "/dev/null" };
 	int max = 0, val = 42;
-	stack( int ) si, t;
+	stack( int ) s, t;
 
-	REPEAT_TIMED( "push_int", N, push( si, val ); )
-	TIMED( "copy_int", t = si; )
-	TIMED( "clear_int", clear( si ); )
+	REPEAT_TIMED( "push_int", N, push( s, val ); )
+	TIMED( "copy_int", t = s; )
+	TIMED( "clear_int", clear( s ); )
 	REPEAT_TIMED( "pop_int", N, int x = pop( t ); max = max( x, max ); )
 	REPEAT_TIMED( "print_int", N/2, out | val | ':' | val | endl; )
 
-	pair( _Bool, char ) max = { (_Bool)0, '\0' }, val = { (_Bool)1, 'a' };
+	pair( _Bool, char ) max = { (_Bool)false, '\0' }, val = { (_Bool)true, 'a' };
 	stack( pair( _Bool, char ) ) s, t;