diff --git a/paper/gtt.tex b/paper/gtt.tex
index e5c10b57ebfc3c253f5915909b75f5edcb4c04de..a085ae6caafeecfdc6bb23dc85f0713bb2bd57ae 100644
--- a/paper/gtt.tex
+++ b/paper/gtt.tex
@@ -12,8 +12,8 @@
 \newif\ifshort
 \newif\iflong
 %% Pick long or short version:
-\shorttrue
-%% \longtrue
+%% \shorttrue
+\longtrue
 
 %% Note: Authors migrating a paper from PACMPL format to traditional
 %% SIGPLAN proceedings format should change 'acmlarge' to
@@ -233,6 +233,7 @@
 \newcommand{\roll}{\kw{roll}}
 \newcommand{\rollty}[1]{\texttt{roll}_{#1}\,\,}
 \newcommand{\unroll}{\kw{unroll}}
+\newcommand{\unrollty}[1]{\texttt{unroll}_{#1}\,\,}
 \newcommand{\defupcast}[2]{\langle\kern-1ex~\langle{#2}\uarrow{#1}\rangle\kern-1ex~\rangle}
 \newcommand{\defdncast}[2]{\langle\kern-1ex~\langle{#1}\darrow{#2}\rangle\kern-1ex~\rangle}
 
@@ -925,12 +926,12 @@ typed code that works with the dynamic type $\dynv$.
     \colorbox{lightgray}{$\Phi$} ::= & \colorbox{lightgray}{$\cdot \mid \Phi, x \ltdyn x': A \ltdyn A'$} &
     \colorbox{lightgray}{$\Psi$} ::= & \colorbox{lightgray}{$\cdot \mid \bullet \ltdyn \bullet : \u B \ltdyn \u B'$} \\  
     \end{array}\\\\
-\begin{longonly}
+\iflong
     \begin{array}{c}
     \hspace{2.5in} T ::= A \mid \u B \\
     \hspace{2.5in} E ::= V \mid M  \\
   \end{array}\\\\
-\end{longonly}
+\fi
   %
   \begin{array}{c}
     \framebox{$\Gamma \vdash V : A$ and $\Gamma \mid \Delta \vdash M : \u B$} \qquad
@@ -6528,7 +6529,8 @@ to
     \]
 \end{small}
 \end{shortonly}
-\begin{longonly}
+
+\iflong
   as in Figure~\ref{fig:operation-cbpv-syntax}.
   
 \begin{figure}
@@ -6553,7 +6555,7 @@ to
 \caption{Operational CBPV Syntax}
 \label{fig:operation-cbpv-syntax}
 \end{figure}
-\end{longonly}
+\fi
 %
 In \cbpv, values include only introduction forms, as usual for values in
 operational semantics, and \cbpv\/ stacks consist only of elimination