Index: openacs-4/packages/acs-tcl/tcl/apm-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-procs-oracle.xql,v
diff -u -r1.19.2.1 -r1.19.2.2
--- openacs-4/packages/acs-tcl/tcl/apm-procs-oracle.xql	8 Jan 2020 12:05:11 -0000	1.19.2.1
+++ openacs-4/packages/acs-tcl/tcl/apm-procs-oracle.xql	26 Jun 2022 19:37:54 -0000	1.19.2.2
@@ -3,19 +3,6 @@
 <queryset>
    <rdbms><type>oracle</type><version>8.1.6</version></rdbms>
 
-<fullquery name="apm_highest_version.apm_highest_version">
-      <querytext>
-
-	begin
-	:1 := apm_package.highest_version (
-                    package_key => :package_key
-		    );
-	end;
-
-      </querytext>
-</fullquery>
-
-
 <fullquery name="apm_highest_version_name.apm_highest_version_name">
       <querytext>
 
Index: openacs-4/packages/acs-tcl/tcl/apm-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-procs-postgresql.xql,v
diff -u -r1.19.2.1 -r1.19.2.2
--- openacs-4/packages/acs-tcl/tcl/apm-procs-postgresql.xql	8 Jan 2020 12:05:11 -0000	1.19.2.1
+++ openacs-4/packages/acs-tcl/tcl/apm-procs-postgresql.xql	26 Jun 2022 19:37:54 -0000	1.19.2.2
@@ -3,17 +3,6 @@
 <queryset>
    <rdbms><type>postgresql</type><version>7.1</version></rdbms>
 
-<fullquery name="apm_highest_version.apm_highest_version">
-      <querytext>
-
-	select  apm_package__highest_version (
-                    :package_key
-		    );
-
-      </querytext>
-</fullquery>
-
-
 <fullquery name="apm_highest_version_name.apm_highest_version_name">
       <querytext>
 
Index: openacs-4/packages/acs-tcl/tcl/apm-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-procs.tcl,v
diff -u -r1.114.2.39 -r1.114.2.40
--- openacs-4/packages/acs-tcl/tcl/apm-procs.tcl	10 Feb 2022 21:33:44 -0000	1.114.2.39
+++ openacs-4/packages/acs-tcl/tcl/apm-procs.tcl	26 Jun 2022 19:37:54 -0000	1.114.2.40
@@ -1067,7 +1067,7 @@
     Return the highest version of the indicated package.
     @return the version_id of the highest installed version of a package.
 } {
-    return [db_exec_plsql apm_highest_version {}]
+    return [acs::dc call apm_package highest_version -package_key $package_key]
 }
 
 ad_proc -public apm_highest_version_name {package_key} {
Index: openacs-4/packages/acs-tcl/tcl/parameter-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/parameter-procs.tcl,v
diff -u -r1.26.2.7 -r1.26.2.8
--- openacs-4/packages/acs-tcl/tcl/parameter-procs.tcl	21 Feb 2022 20:13:43 -0000	1.26.2.7
+++ openacs-4/packages/acs-tcl/tcl/parameter-procs.tcl	26 Jun 2022 19:37:55 -0000	1.26.2.8
@@ -41,8 +41,13 @@
     @param value what value to set said parameter to
 } {
 
-    db_exec_plsql set_parameter_value {}
+    #db_exec_plsql set_parameter_value {}
 
+    ::acs::dc call apm set_value \
+        -package_key $package_key \
+        -parameter $parameter \
+        -attr_value $value
+
     acs::clusterwide callback subsite::global_parameter_changed \
         -package_key $package_key \
         -parameter $parameter \
@@ -119,8 +124,21 @@
         set package_id [ad_requested_object_id]
     }
 
+    #
+    # We have two different definitions of set_parameter_value/3 with
+    # differently typed arguments.  Polyphorism is not supported
+    # yet. We should define set_value/4, or mirror the names we have
+    # here (set_value vs. set_global_value). For the time being, we
+    # keep the xql files for "db_exec_plsql" around, maybe some other
+    # use cases hint a different approach.
+    #
     db_exec_plsql set_parameter_value {}
 
+    #::acs::dc call apm set_value \
+    #    -package_id $package_id \
+    #    -parameter_name $parameter \
+    #    -attr_value $value
+
     acs::clusterwide callback subsite::parameter_changed \
         -package_id $package_id \
         -parameter $parameter \
@@ -218,7 +236,7 @@
         {-default ""}
     } {
         ns_log notice "parameter::get_from_package_key: called during initialization:" \
-            "$package_key.$parameter -> '$default' (default)" 
+            "$package_key.$parameter -> '$default' (default)"
         return $default
     }
 
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 -r1.126.2.67 -r1.126.2.68
--- openacs-4/packages/acs-tcl/tcl/security-procs.tcl	7 Jun 2022 08:18:15 -0000	1.126.2.67
+++ openacs-4/packages/acs-tcl/tcl/security-procs.tcl	26 Jun 2022 19:37:55 -0000	1.126.2.68
@@ -874,7 +874,7 @@
     db_release_unused_handles
 }
 
-ad_proc -private security::cookie_name {plain_name} {
+ad_proc security::cookie_name {plain_name} {
 
 } {
     #