Index: library/lib/make.tcl
===================================================================
diff -u -r35c67391973a07983d0b0dfe70706e6a69fbdbfc -rabac3188f00f8c9be8bd99e92598fc8b91c84fd7
--- library/lib/make.tcl	(.../make.tcl)	(revision 35c67391973a07983d0b0dfe70706e6a69fbdbfc)
+++ library/lib/make.tcl	(.../make.tcl)	(revision abac3188f00f8c9be8bd99e92598fc8b91c84fd7)
@@ -39,7 +39,7 @@
       if {[file exists pkgIndex.tcl]} {
         file delete -force pkgIndex.tcl
       }
-      #puts stderr "callinglevel <[self callinglevel]> $fls"
+      #puts stderr "callinglevel <[current callinglevel]> $fls"
       #puts stderr "[pwd]:\n\tcall eval pkg_mkIndex -verbose -direct . $fls"
       if {[catch {pkg_mkIndex -verbose -direct . {*}$fls} errs]} {
         puts stderr "!!! $errs"
@@ -103,8 +103,8 @@
 
   foreach subcmd [array names :destructive] {
     :method $subcmd args {
-      #puts stderr " [pwd] call: '::tcl_file [self proc] $args'"
-      ::tcl_file [self proc] {*}$args
+      #puts stderr " [pwd] call: '::tcl_file [current method] $args'"
+      ::tcl_file [current method] {*}$args
     }
   }
 }
@@ -120,13 +120,13 @@
   if {![file exists destructive($f)] || [file eval [list set :destructive($f)]]} {
     #puts stderr destruct=$f
     make::-n method $f args {
-	puts "--- [pwd]:\t[self proc] $args"
+	puts "--- [pwd]:\t[current method] $args"
     }
   } else {
     #puts stderr nondestruct=$f
     make::-n method $f args {
       set r [next]
-      #puts "??? [self proc] $args -> {$r}"
+      #puts "??? [current method] $args -> {$r}"
       return $r
     }
   }
Index: library/serialize/pkgIndex.tcl
===================================================================
diff -u -r183ec0e7c071586238bf5ed90a05dbbda91d4582 -rabac3188f00f8c9be8bd99e92598fc8b91c84fd7
--- library/serialize/pkgIndex.tcl	(.../pkgIndex.tcl)	(revision 183ec0e7c071586238bf5ed90a05dbbda91d4582)
+++ library/serialize/pkgIndex.tcl	(.../pkgIndex.tcl)	(revision abac3188f00f8c9be8bd99e92598fc8b91c84fd7)
@@ -9,6 +9,3 @@
 # full path name of this file's directory.
 
 package ifneeded nx::serializer 1.0 [list source [file join $dir serializer.tcl]]
-package ifneeded xotcl::scriptCreation::recoveryPoint 0.8 [list source [file join $dir RecoveryPoint.xotcl]]
-package ifneeded xotcl::scriptCreation::scriptCreator 0.8 [list source [file join $dir ScriptCreator.xotcl]]
-package ifneeded xotcl::serializer 1.0 [list source [file join $dir Serializer.xotcl]]