Index: openacs-4/packages/xotcl-core/tcl/doc-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/doc-procs.tcl,v
diff -u -r1.6 -r1.6.2.1
--- openacs-4/packages/xotcl-core/tcl/doc-procs.tcl	18 May 2018 09:32:08 -0000	1.6
+++ openacs-4/packages/xotcl-core/tcl/doc-procs.tcl	30 Mar 2019 19:34:01 -0000	1.6.2.1
@@ -46,7 +46,7 @@
         } else {
             set style ""
         }
-        set url [export_vars -base show-object [list [list object $e]]]
+        set url [export_vars -base show-object {{object $e}}
         append definition "[dotquote $e] \[${style}URL=\"$url\",label=\"\{$e|"
         foreach slot [$e info slots] {
             set name ""
@@ -67,7 +67,7 @@
 
     ad_proc dotobject {e} {
     } {
-        set url [export_vars -base show-object [list [list object $e]]]
+        set url [export_vars -base show-object {{object $e}}]
         set definition "[dotquote $e] \[URL=\"$url\"\];\n";
     }
 
Index: openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl,v
diff -u -r1.189.2.6 -r1.189.2.7
--- openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl	13 Mar 2019 11:51:59 -0000	1.189.2.6
+++ openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl	30 Mar 2019 19:38:05 -0000	1.189.2.7
@@ -1574,7 +1574,7 @@
             if { $excluded_vars_url ne "" } {
                 append excluded_vars_url "&"
             }
-            append excluded_vars_url [export_vars -url [list [list "$item" "$value"]]]
+            append excluded_vars_url [export_vars -url {{"$item" "$value"}}]
         }
     }
 
Index: openacs-4/packages/xowiki/www/xinha/insert-wlink.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/xinha/insert-wlink.tcl,v
diff -u -r1.6 -r1.6.2.1
--- openacs-4/packages/xowiki/www/xinha/insert-wlink.tcl	9 Apr 2018 07:47:05 -0000	1.6
+++ openacs-4/packages/xowiki/www/xinha/insert-wlink.tcl	30 Mar 2019 19:43:54 -0000	1.6.2.1
@@ -11,10 +11,10 @@
 
 set url [ad_conn url]
 set back_link [expr { ($page_number > 1) ? \
-                          [export_vars -base $url [list package_id [list page_number [expr {$page_number-1}]]]] \
+                          [export_vars -base $url {package_id {page_number [expr {$page_number-1}]}}] \
                           : ""}]
 set next_link [expr { $total_rows > ($page_number * $page_size) ? \
-                          [export_vars -base $url [list package_id [list page_number [expr {$page_number+1}]]]] \
+                          [export_vars -base $url {package_id {page_number [expr {$page_number+1}]}}] \
                           : ""}]
 
 set listing [::xowiki::Includelet listing \