Index: openacs-4/packages/xotcl-core/tcl/20-Ordered-Composite-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/20-Ordered-Composite-procs.tcl,v
diff -u -r1.18 -r1.19
--- openacs-4/packages/xotcl-core/tcl/20-Ordered-Composite-procs.tcl	28 Oct 2010 22:15:25 -0000	1.18
+++ openacs-4/packages/xotcl-core/tcl/20-Ordered-Composite-procs.tcl	30 Oct 2010 22:07:58 -0000	1.19
@@ -90,9 +90,13 @@
     [self class]::ChildManager instvar composite
     # push the active composite
     lappend composite [self]
+    # check, if we have Tcl's apply available
+    if {$::tcl_version >= 8.5 && [info proc apply] eq ""} {
+      set errorOccurred [catch {::apply [list {} $cmds [self]]} errorMsg]
+    } else {
+      set errorOccurred [catch {namespace eval [self] $cmds} errorMsg]
+    }
 
-    set errorOccurred [catch {namespace eval [self] $cmds} errorMsg]
-
     # pop the last active composite
     set composite [lrange $composite 0 end-1]
 
Index: openacs-4/packages/xotcl-core/tcl/30-widget-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/30-widget-procs.tcl,v
diff -u -r1.48 -r1.49
--- openacs-4/packages/xotcl-core/tcl/30-widget-procs.tcl	16 Jul 2010 00:37:41 -0000	1.48
+++ openacs-4/packages/xotcl-core/tcl/30-widget-procs.tcl	30 Oct 2010 22:07:58 -0000	1.49
@@ -204,8 +204,9 @@
 
   proc localize {text {inline 0}} {
     #ns_log notice "--local $text $inline"
-    if {![my exists __localizer]} {
-      my set __localizer [list]
+    set obj [uplevel self]
+    if {![$obj exists __localizer]} {
+      $obj set __localizer [list]
     }
     if {[string first \x002 $text] == -1} {
       return $text
@@ -242,7 +243,7 @@
 	  set type missing
 	}
         if {!$inline} {
-          my lappend __localizer [::xo::Localizer new -type $type -key $key -url $url]
+          $obj lappend __localizer [::xo::Localizer new -type $type -key $key -url $url]
         } else {
           set l [::xo::Localizer new -type $type -key $key -url $url]
           append return_text [$l asHTML]
@@ -254,8 +255,9 @@
   }
 
   proc render_localizer {} {
-    if {[my exists __localizer]} {
-      foreach l [my set __localizer] {
+    set obj [uplevel self]
+    if {[$obj exists __localizer]} {
+      foreach l [$obj set __localizer] {
 	$l render
 	$l destroy
       }
@@ -354,17 +356,17 @@
   }
   Table instproc actions {cmd} {
     set M [OrderedComposite create [self]::__actions]
-    namespace eval $M {namespace import -force [self class]::*}
+    namespace eval $M [list namespace import -force [self class]::*]
     $M contains $cmd
   }
   Table instproc __bulkactions {cmd} {
     set M [OrderedComposite create [self]::__bulkactions]
-    namespace eval $M {namespace import -force [self class]::*}
+    namespace eval $M [list namespace import -force [self class]::*]
     $M contains $cmd
   }
   Table instproc columns {cmd} {
     set M [OrderedComposite create [self]::__columns]
-    namespace eval $M {namespace import -force [self class]::*}
+    namespace eval $M [list namespace import -force [self class]::*]
     $M contains $cmd
     set slots [list]
     foreach c [$M children] {
@@ -472,10 +474,11 @@
 	-superclass ::xo::OrderedComposite::Child \
 	-parameter {name id {html {}}} \
         -instproc actions {cmd} {
-          my init
+          #my init
           set grandParent [[my info parent] info parent]
           if {![my exists name]} {my set name [namespace tail [self]]}
-          set M [::xo::OrderedComposite create ${grandParent}::__bulkactions]
+          #set M [::xo::OrderedComposite create ${grandParent}::__bulkactions]
+          set M [::xo::OrderedComposite create ${grandParent}::__bulkactions -noinit]
           namespace eval $M {namespace import -force ::xo::Table::*}
           $M contains $cmd
           $M set __belongs_to [self]
Index: openacs-4/packages/xowiki/tcl/includelet-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/includelet-procs.tcl,v
diff -u -r1.160 -r1.161
--- openacs-4/packages/xowiki/tcl/includelet-procs.tcl	15 Aug 2010 11:13:49 -0000	1.160
+++ openacs-4/packages/xowiki/tcl/includelet-procs.tcl	30 Oct 2010 22:07:58 -0000	1.161
@@ -51,7 +51,7 @@
   }    
     
   ::xowiki::Includelet proc describe_includelets {includelet_classes} {
-    my log "--plc=$includelet_classes "
+    #my log "--plc=$includelet_classes "
     foreach cl $includelet_classes {
       set result ""
       append result "{{<b>[namespace tail $cl]</b>"
Index: openacs-4/packages/xowiki/www/view-book-no-ajax.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/Attic/view-book-no-ajax.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/xowiki/www/view-book-no-ajax.tcl	22 Jun 2010 17:18:39 -0000	1.5
+++ openacs-4/packages/xowiki/www/view-book-no-ajax.tcl	30 Oct 2010 22:07:58 -0000	1.6
@@ -1,8 +1,8 @@
-set title [$package_id get_parameter PackageTitle [my instance_name]]
+set title [$package_id get_parameter PackageTitle [$package_id instance_name]]
 #set toc   [$page include [list toc -ajax 0 -open_page $name -decoration plain -remove_levels 0]]
 set toc   [$page include [list toc -style list -open_page $name -expand_all 1 -decoration plain]]
 set i     [$page set __last_includelet]
-#my log "--last includelet = $i, class=[$i info class] [$page exists __is_book_page]"
+#$package_id log "--last includelet = $i, class=[$i info class] [$page exists __is_book_page]"
 
 # prevent recursive books
 if {$i ne "" && ![$page exists __is_book_page]} {
Index: openacs-4/packages/xowiki/www/view-book.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/Attic/view-book.tcl,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/xowiki/www/view-book.tcl	17 Jun 2010 10:45:12 -0000	1.10
+++ openacs-4/packages/xowiki/www/view-book.tcl	30 Oct 2010 22:07:58 -0000	1.11
@@ -1,7 +1,7 @@
-set title [$package_id get_parameter PackageTitle [my instance_name]]
+set title [$package_id get_parameter PackageTitle [$package_id instance_name]]
 set toc   [$page include [list toc -open_page $name -decoration plain -remove_levels 1]]
 set i     [$page set __last_includelet]
-#my log "--last includelet = $i, class=[$i info class] [$page exists __is_book_page]"
+#$package_id log "--last includelet = $i, class=[$i info class] [$page exists __is_book_page]"
 
 # prevent recursive books
 if {$i ne "" && ![$page exists __is_book_page]} {