Index: openacs-4/packages/acs-templating/tcl/parse-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/parse-procs.tcl,v
diff -u -N -r1.48.2.3 -r1.48.2.4
--- openacs-4/packages/acs-templating/tcl/parse-procs.tcl	7 Oct 2013 16:42:30 -0000	1.48.2.3
+++ openacs-4/packages/acs-templating/tcl/parse-procs.tcl	7 Oct 2013 17:47:50 -0000	1.48.2.4
@@ -251,18 +251,12 @@
 
     @return The output produced by the compiled template code.
 } {
-  upvar $coderef code
+  upvar $coderef code __adp_output output
+  lappend ::template::parse_level [expr {[info level]-1}]
 
-  eval "uplevel {
-    lappend ::template::parse_level \[info level\]
+  uplevel $code
 
-    $code
-
-    template::util::lpop ::template::parse_level
-  }"
-
-  upvar __adp_output output
-
+  template::util::lpop ::template::parse_level
   return $output
 }