Index: openacs-4/packages/xowiki/tcl/bootstrap-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/bootstrap-procs.tcl,v
diff -u -N -r1.11.2.10 -r1.11.2.11
--- openacs-4/packages/xowiki/tcl/bootstrap-procs.tcl	29 Sep 2019 17:32:29 -0000	1.11.2.10
+++ openacs-4/packages/xowiki/tcl/bootstrap-procs.tcl	30 Sep 2019 07:27:48 -0000	1.11.2.11
@@ -466,26 +466,28 @@
       set bulkaction_container [[lindex $bulkactions 0] set __parent]
       set name [$bulkaction_container set __identifier]
 
-      foreach ba $bulkactions {
-        set id [::xowiki::Includelet html_id $ba]
+      foreach bulk_action $bulkactions {
+        set id [::xowiki::Includelet html_id $bulk_action]
         html::ul -class compact {
           html::li {
+            #
             # For some reason, btn-secondary seems not to be available
             # for the "a" tag, so we set the border-color manually.
+            #
             html::a -class "btn btn-secondary" -rule button \
-                -title [$ba tooltip] -href # \
+                -title [$bulk_action tooltip] -href # \
                 -style "border-color: #ccc;" \
                 -id $id {
-                  html::t [$ba label]
+                  html::t [$bulk_action label]
                 }
           }
         }
         set script [subst {
-          acs_ListBulkActionClick("$name","[$ba url]");
+          acs_ListBulkActionClick("$name","[$bulk_action url]");
         }]
-        if {[$ba confirm_message] ne ""} {
+        if {[$bulk_action confirm_message] ne ""} {
           set script [subst {
-            if (confirm('[$ba confirm_message]')) {
+            if (confirm('[$bulk_action confirm_message]')) {
               $script
             }
           }]
Index: openacs-4/packages/xowiki/tcl/xowiki-form-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-form-procs.tcl,v
diff -u -N -r1.147.2.6 -r1.147.2.7
--- openacs-4/packages/xowiki/tcl/xowiki-form-procs.tcl	29 Aug 2019 13:34:33 -0000	1.147.2.6
+++ openacs-4/packages/xowiki/tcl/xowiki-form-procs.tcl	30 Sep 2019 07:27:48 -0000	1.147.2.7
@@ -680,7 +680,7 @@
   }
   PageInstanceForm instproc set_submit_link_edit {} {
     set object_type [[${:data} info class] object_type]
-    #:log "-- data=${:data} cl=[${:data} info class] ot=$object_type"
+    #:log "-- data=${:data} cl=[${:data} info class] object_type=$object_type"
     set item_id [${:data} set item_id]
     set page_template [${:data} form_parameter page_template]
     if {[${:data} exists_query_parameter return_url]} {
@@ -719,7 +719,7 @@
   PageInstanceEditForm instproc new_data {} {
     set __vars {folder_id item_id page_template return_url}
     set object_type [[${:data} info class] object_type]
-    #:log "-- cl=[${:data} info class] ot=$object_type $__vars"
+    #:log "-- class=[${:data} info class] object_type=$object_type $__vars"
     foreach __v $__vars {set $__v [${:data} from_parameter $__v] ""}
     set item_id [next]
 
Index: openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl,v
diff -u -N -r1.368.2.35 -r1.368.2.36
--- openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl	13 Sep 2019 15:26:01 -0000	1.368.2.35
+++ openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl	30 Sep 2019 07:27:48 -0000	1.368.2.36
@@ -865,24 +865,32 @@
     # We have to do template mangling here; ad_form_template writes
     # form variables into the actual parse-level, so we have to be in
     # our own level in order to access an pass these.
+    #
     lappend ::template::parse_level [info level]
 
     set action_vars [expr {$new ? "{edit-new 1} object_type return_url" : "{m edit} return_url"}]
-    #:log "--formclass=[$object_type getFormClass -data [self]] ot=$object_type"
+    #:log "--formclass=[$object_type getFormClass -data [self]] object_type=$object_type"
 
     #
     # Determine the package_id of some mounted xowiki instance to find
     # the directory + URL, from where the scripts called from Xinha
     # can be used.
+    #
     if {[::${:package_id} info class] eq "::xowiki::Package"} {
-      # The actual instance is a plain xowiki instance, we can use it
+      #
+      # The actual instance is a plain xowiki instance, we can use it.
+      #
       set folder_spec [list script_dir [::${:package_id} package_url]]
     } else {
+      #
       # The actual instance is not a plain xowiki instance, so, we try
       # to find one, where the current user has at least read
       # permissions.  This act is required for sub-packages, which
       # might not have the script dir.
-      set first_instance_id [::xowiki::Package first_instance -party_id [::xo::cc user_id] -privilege read]
+      #
+      set first_instance_id [::xowiki::Package first_instance \
+                                 -party_id [::xo::cc user_id] \
+                                 -privilege read]
       if {$first_instance_id ne ""} {
         ::xowiki::Package require $first_instance_id
         set folder_spec [list script_dir [::$first_instance_id package_url]]