Index: openacs-4/packages/xowiki/tcl/package-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/package-procs.tcl,v
diff -u -r1.332.2.2 -r1.332.2.3
--- openacs-4/packages/xowiki/tcl/package-procs.tcl	22 Mar 2019 13:08:49 -0000	1.332.2.2
+++ openacs-4/packages/xowiki/tcl/package-procs.tcl	25 Mar 2019 19:15:00 -0000	1.332.2.3
@@ -606,20 +606,22 @@
     set name $path
 
     if {[regexp {^/(/.*)$} $path _ path]} {
-      array set "" [site_node::get_from_url -url $path]
-      if {$(package_key) eq "acs-subsite"} {
+      set siten_node_info [site_node::get_from_url -url $path]
+      set package_key [dict get $siten_node_info package_key]
+
+      if {$package_key eq "acs-subsite"} {
         # the main site
         return 0
       }
-      set package_id $(package_id)
-      set package_class [::xo::PackageMgr get_package_class_from_package_key $(package_key)]
+      set package_id [dict get $siten_node_info package_id]
+      set package_class [::xo::PackageMgr get_package_class_from_package_key $package_key]
       if {$package_class ne ""} {
         # we found an xo::Package, but is it an xowiki package?
         set classes [list $package_class {*}[$package_class info heritage]]
         if {"::xowiki::Package" in $classes} {
           # yes, it is an xowiki::package, compute the name and return the package_id
           ::xowiki::Package require $package_id
-          set name [string range $path [string length $(url)] end]
+          set name [string range $path [string length [dict get $siten_node_info url]] end]
           return $package_id
         }
       }
@@ -640,14 +642,19 @@
       # When we have an absolute url, we are working on a different
       # package.
       #
-      array set "" [site_node::get_from_url -url $fullurl]
-      if {$(package_id) eq ""} {return ""}
-      if {$(name) ne ""} {set package_id $(package_id)}
+      set siten_node_info [site_node::get_from_url -url $fullurl]
+
+      if {[dict get $siten_node_info package_id] eq ""} {
+        return ""
+      }
+      if {[dict get $siten_node_info name] ne ""} {
+        set package_id $(package_id)
+      }
       #
       # Use site-node url as package_url and get the full path within
       # under the xo* sitenode (provided path)
       #
-      set url $(url)
+      set url [dict get $siten_node_info url]
       set provided_name [string range $fullurl [string length $url] end]
       ::xowiki::Package require $package_id
       :get_lang_and_name -default_lang $default_lang -path $page_name lang stripped_name
Index: openacs-4/packages/xowiki/tcl/xowiki-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-procs.tcl,v
diff -u -r1.542.2.4 -r1.542.2.5
--- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	25 Mar 2019 09:05:06 -0000	1.542.2.4
+++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	25 Mar 2019 19:15:00 -0000	1.542.2.5
@@ -1326,10 +1326,9 @@
     ::xo::db::CrClass get_instance_from_db -item_id ${:item_id}
 
     set props [::xo::cc cache [list ${:item_id} compute_link_properties $item_ref]]
-    array set "" $props
-    if {[info exists ($property)]} {
-      #${:item_id} msg "prop $property ==> $($property)"
-      return $($property)
+    if {[info exists [dict exists $props $property]} {
+      #${:item_id} msg "prop $property ==> [dict get $props $property]"
+      return [dict get $props $property]
     }
     return $default
   }
@@ -2213,9 +2212,9 @@
 
   Page instproc detail_link {} {
     if {[info exists :instance_attributes]} {
-      set __ia ${:instance_attributes}
-      if {[dict exists $__ia detail_link] && [dict get $__ia detail_link] ne ""} {
-        return [dict get $__ia detail_link]
+      if {[dict exists ${:instance_attributes} detail_link]
+          && [dict get ${:instance_attributes} detail_link] ne ""} {
+        return [dict get ${:instance_attributes} detail_link]
       }
     }
     return [:pretty_link]
@@ -2277,25 +2276,26 @@
     # set name file:$stripped_name
     #  }
 
-    array set "" [:get_anchor_and_query $link]
-
+    set link_info [:get_anchor_and_query $link]
     set parent_id [expr {$package_id == ${:package_id} ?
                          ${:parent_id} : [$package_id folder_id]}]
 
     # we might consider make this configurable
     set use_package_path true
     set is_self_link false
 
-    if {[regexp {^:(..):(.+)$} $(link) _ lang stripped_name]} {
-      # we found a language link (it starts with a ':')
+    if {[regexp {^:(..):(.+)$} [dict get $link_info link] _ lang stripped_name]} {
+      #
+      # a language link (it starts with a ':')
+      #
       array set "" [$package_id item_ref \
                         -use_package_path $use_package_path \
                         -default_lang [:lang] \
                         -parent_id $parent_id \
                         ${lang}:$stripped_name]
-      set (link_type) language
+      dict set link_info link_type language
 
-    } elseif {[regexp {^[.]SELF[.]/(.*)$} $(link) _ (link)]} {
+    } elseif {[regexp {^[.]SELF[.]/(.*)$} [dict get $link_info link] _ (link)]} {
       #
       # Remove ".SELF./" from the path and search for the named
       # resource (e.g. the image name) under the current (physical)
@@ -2307,36 +2307,45 @@
                         -use_package_path $use_package_path \
                         -default_lang [:lang] \
                         -parent_id [:physical_item_id] \
-                        $(link)]
+                        [dict get $link_info link]]
       #:log "SELF-LINK returns [array get {}]"
 
     } else {
       #
-      # a plain link, search relative to the parent
+      # A plain link, search relative to the parent.
       #
       array set "" [$package_id item_ref \
                         -use_package_path $use_package_path \
                         -default_lang [:lang] \
                         -parent_id $parent_id \
-                        $(link)]
+                        [dict get $link_info link]]
     }
 
-    #:log "link '$(link)' package_id $package_id ${:package_id} => [array get {}]"
+    #:log "link '[dict get $link_info link]' package_id $package_id ${:package_id} => [array get {}]"
 
-    if {$label eq $arg} {set label $(link)}
+    if {$label eq $arg} {
+      set label [dict get $link_info link]
+    }
 
-    set item_name [string trimleft $(prefix):$(stripped_name) :]
+    set item_name [string trimleft [dict get $link_info prefix]:[dict get $link_info stripped_name] :]
     Link create [self]::link \
-        -page [self] -form $(form) \
-        -type $(link_type) [list -name $item_name] -lang $(prefix) \
-        [list -anchor $(anchor)] [list -query $(query)] \
-        [list -stripped_name $(stripped_name)] [list -label $label] \
-        -parent_id $(parent_id) -item_id $(item_id) -package_id $package_id \
+        -page [self] \
+        -form [dict get $link_info form] \
+        -type [dict get $link_info link_type] \
+        [list -name $item_name] \
+        -lang [dict get $link_info prefix] \
+        [list -anchor [dict get $link_info anchor]] \
+        [list -query [dict get $link_info query]] \
+        [list -stripped_name [dict get $link_info stripped_name]] \
+        [list -label $label] \
+        -parent_id [dict get $link_info parent_id] \
+        -item_id [dict get $link_info item_id] \
+        -package_id $package_id \
         -is_self_link $is_self_link
 
     # in case, we can't link, flush the href
-    if {[:can_link $(item_id)] == 0} {
-      :references refused $(item_id)
+    if {[:can_link [dict get $link_info item_id]] == 0} {
+      :references refused [dict get $link_info item_id]
       [self]::link href ""
     }
 
@@ -2353,7 +2362,9 @@
   }
 
   Page instproc new_link {-object_type -name -title -nls_language -return_url -parent_id page_package_id} {
-    if {[info exists parent_id] && $parent_id eq ""} {unset parent_id}
+    if {[info exists parent_id] && $parent_id eq ""} {
+      unset parent_id
+    }
     return [$page_package_id make_link $page_package_id \
                 edit-new object_type name title nls_language return_url parent_id autoname]
   }
@@ -2363,7 +2374,9 @@
       next
     } else {
       set template_id [:page_template]
-      if {![info exists parent_id]} {set parent_id [$page_package_id folder_id]}
+      if {![info exists parent_id]} {
+        set parent_id [$page_package_id folder_id]
+      }
       set form [$page_package_id pretty_link -parent_id $parent_id [$template_id name]]
       return [$page_package_id make_link -link $form $template_id \
                   create-new return_url name title nls_language]
@@ -3883,7 +3896,6 @@
         ::xo::Package require $package_id
       }
     }
-    # array set :__ia [:instance_attributes]
     next
   }
   FormPage instproc initialize {} {