Index: openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl,v
diff -u -r1.120 -r1.121
--- openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl	26 Sep 2017 19:44:59 -0000	1.120
+++ openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl	1 Oct 2017 12:16:05 -0000	1.121
@@ -249,7 +249,7 @@
 
     rp_debug -debug $debug_p "Invoking $why filter $proc"
 
-    switch $arg_count {
+    switch -- $arg_count {
         0 { set errno [catch { set result [$proc] } error] }
         1 { set errno [catch { set result [$proc $why] } error] }
         2 { set errno [catch { set result [$proc $conn $why] } error] }
@@ -309,7 +309,7 @@
 
     rp_debug -debug $debug_p "Invoking registered procedure $proc"
 
-    switch $arg_count {
+    switch -- $arg_count {
         0 { set errno [catch $proc error] }
         1 { set errno [catch "$proc $arg" error] }
         default { set errno [catch {
@@ -528,6 +528,10 @@
     @author Don Baccus (dhogaza@pacifier.com)
 
 } {
+    if {[info commands ::valgrind] ne ""} {
+        ::valgrind start
+    }
+
     ad_conn -set untrusted_user_id 0
     set path "[acs_package_root_dir [lindex [ns_conn urlv] 1]]/www/resources/[join [lrange [ns_conn urlv] 2 end] /]"
     if { [file isfile $path] } {
@@ -1455,7 +1459,7 @@
             # own caching, so calling it instead of [ns_conn form]
             # is OK.
 
-            switch $var {
+            switch -- $var {
                 form {
                     return [ns_getform]
                 }
@@ -1468,7 +1472,7 @@
                     }
 
                     # Fallback
-                    switch $var {
+                    switch -- $var {
                         locale {
                             set ad_conn(locale) [parameter::get \
                                                      -parameter SiteWideLocale \