Index: openacs-4/packages/acs-tcl/tcl/apm-file-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-file-procs.tcl,v
diff -u -N -r1.36.2.4 -r1.36.2.5
--- openacs-4/packages/acs-tcl/tcl/apm-file-procs.tcl	2 Jan 2016 00:46:27 -0000	1.36.2.4
+++ openacs-4/packages/acs-tcl/tcl/apm-file-procs.tcl	2 Jan 2016 20:42:57 -0000	1.36.2.5
@@ -102,7 +102,7 @@
     Returns a list of valid database type keys.
 
 } {
-    return [util_memoize [list db_list db_type_keys "select db_type_key from apm_package_db_types"]]
+    return [util_memoize [list db_list db_type_keys {select db_type_key from apm_package_db_types}]]
 }
 
 
@@ -239,9 +239,11 @@
     } else {
         #tarball exists, so all we have to do is to make a new revision for it
         #Let's check if a current revision exists:
-        if {![db_0or1row get_revision_id "select live_revision as revision_id
-              from cr_items
-             where item_id = :item_id"] || $revision_id eq ""} {
+        if {![db_0or1row get_revision_id {
+            select live_revision as revision_id
+            from cr_items
+            where item_id = :item_id
+        }] || $revision_id eq ""} {
             # It's an insert rather than an update            
             set revision_id [db_exec_plsql create_revision $create_revision]
         }
Index: openacs-4/packages/acs-tcl/tcl/navigation-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/navigation-procs.tcl,v
diff -u -N -r1.32.2.2 -r1.32.2.3
--- openacs-4/packages/acs-tcl/tcl/navigation-procs.tcl	18 Sep 2015 07:33:49 -0000	1.32.2.2
+++ openacs-4/packages/acs-tcl/tcl/navigation-procs.tcl	2 Jan 2016 20:42:58 -0000	1.32.2.3
@@ -290,7 +290,9 @@
     if { [string match -nocase "www.*" $location_hostname] } {
         set location_hostname [string range $location_hostname 4 end]
     } 
-    db_0or1row -cache_key util-${location_hostname}-node-id get_node_id_from_hostname "select node_id from host_node_map where host = :location_hostname"
+    db_0or1row -cache_key util-${location_hostname}-node-id get_node_id_from_hostname {
+        select node_id from host_node_map where host = :location_hostname
+    }
     if { ![info exists node_id ] } {
         set node_id ""
     }
Index: openacs-4/packages/acs-tcl/tcl/security-init.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/security-init.tcl,v
diff -u -N -r1.5.10.1 -r1.5.10.2
--- openacs-4/packages/acs-tcl/tcl/security-init.tcl	10 Sep 2015 08:21:59 -0000	1.5.10.1
+++ openacs-4/packages/acs-tcl/tcl/security-init.tcl	2 Jan 2016 20:42:58 -0000	1.5.10.2
@@ -14,7 +14,7 @@
 ad_schedule_proc -thread f [parameter::get -parameter SessionSweepInterval -default 7200] sec_sweep_sessions
 
 # Verify that the secret_tokens table is populated
-set secret_tokens_exists [db_string secret_tokens_exists "select decode(count(*),0,0,1) from secret_tokens"]
+set secret_tokens_exists [db_string secret_tokens_exists {select decode(count(*),0,0,1) from secret_tokens}]
 
 if { $secret_tokens_exists == 0 } {
     populate_secret_tokens_db
Index: openacs-4/packages/acs-tcl/tcl/security-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/security-procs.tcl,v
diff -u -N -r1.78.2.6 -r1.78.2.7
--- openacs-4/packages/acs-tcl/tcl/security-procs.tcl	2 Jan 2016 00:46:28 -0000	1.78.2.6
+++ openacs-4/packages/acs-tcl/tcl/security-procs.tcl	2 Jan 2016 20:42:58 -0000	1.78.2.7
@@ -637,7 +637,7 @@
             # revise url to use hostname's domain
             # if url points to a non / host_node, redirect to main hostname
             set host_node_map_hosts_list [db_list -cache_key security-locations-host-names \
-                                              get_node_host_names "select host from host_node_map"]
+                                              get_node_host_names {select host from host_node_map}]
             if { [llength $host_node_map_hosts_list] > 0 } {
                 foreach hostname $host_node_map_hosts_list {
                     if { [string match -nocase "http://${hostname}*" $url_decoded] 
@@ -697,7 +697,7 @@
                 # revise return_url to use hostname's domain
                 # if return_url points to a non / host_node, redirect to main hostname
                 set host_node_map_hosts_list [db_list -cache_key security-locations-host-names \
-                                                  get_node_host_names "select host from host_node_map"]
+                                                  get_node_host_names {select host from host_node_map}]
                 if { [llength $host_node_map_hosts_list] > 0 } {
                     foreach hostname $host_node_map_hosts_list {
                         if { [string match -nocase "http://${hostname}*" $return_url_decoded] \
@@ -1772,7 +1772,7 @@
 
     # add locations from host_node_map 
     set host_node_map_hosts_list [db_list -cache_key security-locations-host-names \
-                                      get_node_host_names "select host from host_node_map"]
+                                      get_node_host_names {select host from host_node_map}]
     # fastest place for handling this special case:
     if { $config_hostname ne $host_name } {
         #ns_log Notice "security::locations adding $config_hostname since utl_current_location different than config.tcl."