Index: openacs-4/packages/acs-templating/tcl/list-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/list-procs.tcl,v
diff -u -r1.57.8.8 -r1.57.8.9
--- openacs-4/packages/acs-templating/tcl/list-procs.tcl	29 Jul 2014 11:37:29 -0000	1.57.8.8
+++ openacs-4/packages/acs-templating/tcl/list-procs.tcl	25 Aug 2014 09:40:06 -0000	1.57.8.9
@@ -1156,7 +1156,7 @@
     # Sort in webserver layer, if requested to do so    
     set __multirow_cols [template::list::multirow_cols -name $__list_properties(name)]
     if { $__multirow_cols ne "" } {
-        eval template::multirow sort $__list_properties(multirow) $__multirow_cols
+        template::multirow sort {*}$__list_properties(multirow) {*}$__multirow_cols
     }
 
     # Upvar other variables passed in through the pass_properties property
Index: openacs-4/packages/acs-templating/tcl/query-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/query-procs.tcl,v
diff -u -r1.33.2.1 -r1.33.2.2
--- openacs-4/packages/acs-templating/tcl/query-procs.tcl	5 Oct 2013 12:55:10 -0000	1.33.2.1
+++ openacs-4/packages/acs-templating/tcl/query-procs.tcl	25 Aug 2014 09:40:06 -0000	1.33.2.2
@@ -352,7 +352,7 @@
       lappend group_values [ns_set get $row $group]
     }
 
-    eval template::util::lnest rows [list $values] $group_values
+    template::util::lnest rows $values {*}$group_values
   }
 
   if { [info exists opts(cache)] } {
Index: openacs-4/packages/acs-templating/tcl/request-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/request-procs.tcl,v
diff -u -r1.7.10.1 -r1.7.10.2
--- openacs-4/packages/acs-templating/tcl/request-procs.tcl	5 Oct 2013 12:55:10 -0000	1.7.10.1
+++ openacs-4/packages/acs-templating/tcl/request-procs.tcl	25 Aug 2014 09:40:06 -0000	1.7.10.2
@@ -56,7 +56,7 @@
       set param [string trim $param]
       if {$param eq {}} { continue }
 
-      eval set_param $param
+      set_param {*}$param
     }
   }
 }
Index: openacs-4/packages/acs-templating/tcl/tab-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/tab-procs.tcl,v
diff -u -r1.5.10.2 -r1.5.10.3
--- openacs-4/packages/acs-templating/tcl/tab-procs.tcl	16 Oct 2013 10:16:17 -0000	1.5.10.2
+++ openacs-4/packages/acs-templating/tcl/tab-procs.tcl	25 Aug 2014 09:40:06 -0000	1.5.10.3
@@ -87,7 +87,7 @@
 
   lappend code -cookie_name $cookie_name
 
-  eval $code $args
+  {*}$code {*}$args
 
   # Determine the current tab
   set level [template::adp_level]
@@ -158,7 +158,7 @@
     lappend code -current 0
   }
 
-  eval "$code $args"
+  {*}$code {*}$args
 
   upvar #$level $dlg_name:$name element
 
Index: openacs-4/packages/acs-templating/www/doc/demo/error.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/demo/error.tcl,v
diff -u -r1.2 -r1.2.20.1
--- openacs-4/packages/acs-templating/www/doc/demo/error.tcl	29 Dec 2003 20:08:52 -0000	1.2
+++ openacs-4/packages/acs-templating/www/doc/demo/error.tcl	25 Aug 2014 09:40:06 -0000	1.2.20.1
@@ -6,7 +6,7 @@
 
 if { [info exists problems] } {
 
-  eval request error $problems
+  request error {*}$problems
 
   # Note that you must explicitly return from the tcl script following an error.
   return