Index: openacs-4/packages/acs-admin/www/apm/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/index.tcl,v
diff -u -N -r1.30.2.1 -r1.30.2.2
--- openacs-4/packages/acs-admin/www/apm/index.tcl	13 Mar 2019 09:32:15 -0000	1.30.2.1
+++ openacs-4/packages/acs-admin/www/apm/index.tcl	13 Mar 2019 09:35:21 -0000	1.30.2.2
@@ -87,12 +87,11 @@
     } -filters {owned_by {} supertype {} status {}}
 
 set performance_p [parameter::get -package_id [ad_acs_kernel_id] -parameter PerformanceModeP -default 1] 
-set reload_links_p [ad_decode [ns_set iget [rp_getform] reload_links_p] \
-                        "" 0 [ns_set iget [rp_getform] reload_links_p]]
+set reload_links_p [string is true -strict [ns_set iget [rp_getform] reload_links_p]]
 
 db_multirow -extend {package_url maintained status action_html} packages apm_table {} {
     set package_url [export_vars -base version-view {version_id}]
-    set maintained [ad_decode $distribution_uri "" "Locally" "Externally"]
+    set maintained [expr {$distribution_uri eq "" ? "Locally" : "Externally"}]
     
     if { $installed_p == "t" } {
 		if { $enabled_p == "t" } {
Index: openacs-4/packages/acs-admin/www/apm/version-callback-add-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-callback-add-edit.tcl,v
diff -u -N -r1.12 -r1.12.2.1
--- openacs-4/packages/acs-admin/www/apm/version-callback-add-edit.tcl	7 Aug 2017 23:47:45 -0000	1.12
+++ openacs-4/packages/acs-admin/www/apm/version-callback-add-edit.tcl	13 Mar 2019 09:40:42 -0000	1.12.2.1
@@ -74,7 +74,9 @@
     }
     {proc
 	{ [apm_callback_has_valid_args -type $type -proc_name $proc] }
-	{The callback proc $proc must be defined with ad_proc [ad_decode [apm_arg_names_for_callback_type -type $type] "" "and should take no arguments" "and have the following required switches: [apm_arg_names_for_callback_type -type $type]"]}
+	{The callback proc $proc must be defined with ad_proc [expr {[apm_arg_names_for_callback_type -type $type] eq "" ?
+                                                                     "and should take no arguments" :
+                                                                     "and have the following required switches: [apm_arg_names_for_callback_type -type $type]"}]}
     }
 } -on_submit {