Index: openacs-4/packages/xowiki/tcl/chat-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/chat-procs.tcl,v
diff -u -r1.54.2.12 -r1.54.2.13
--- openacs-4/packages/xowiki/tcl/chat-procs.tcl	8 May 2019 14:33:40 -0000	1.54.2.12
+++ openacs-4/packages/xowiki/tcl/chat-procs.tcl	3 Jul 2019 20:33:04 -0000	1.54.2.13
@@ -97,7 +97,7 @@
 
     # :log "-- msg=$msg"
     :broadcast_msg [Message new -volatile -time [clock seconds] \
-                        -user_id $user_id -color $color [list -msg $msg]]
+                        -user_id $user_id -color $color -msg $msg]
 
     :register_nsvs ${:now}.$user_id $user_id $msg $color [clock seconds]
     #
Index: openacs-4/packages/xowiki/tcl/form-field-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/form-field-procs.tcl,v
diff -u -r1.284.2.15 -r1.284.2.16
--- openacs-4/packages/xowiki/tcl/form-field-procs.tcl	28 Jun 2019 10:30:27 -0000	1.284.2.15
+++ openacs-4/packages/xowiki/tcl/form-field-procs.tcl	3 Jul 2019 20:33:04 -0000	1.284.2.16
@@ -695,7 +695,7 @@
     }
     set l [::xowiki::Link create new -destroy_on_cleanup \
                -page ${:object} -type "image" -lang $(prefix) \
-               [list -stripped_name $(stripped_name)] [list -label $label] \
+               -stripped_name $(stripped_name) label $label \
                -parent_id $(parent_id) -item_id $(item_id)]
 
     if {[:istype file]} {
@@ -1009,8 +1009,8 @@
 
         set l [::xowiki::Link new -destroy_on_cleanup \
                    -page ${:object} -type "file" -lang $(prefix) \
-                   [list -stripped_name $(stripped_name)] [list -label $fn] \
-                   [list -extra_query_parameter [list [list filename $fn]]] \
+                   -stripped_name $(stripped_name) -label $fn \
+                   -extra_query_parameter [list [list filename $fn]] \
                    -parent_id $(parent_id) -item_id $(item_id)]
         append result [$l render]
       }