Index: library/nx/nx.tcl
===================================================================
diff -u -raaced4467cdf9fd24e428c1a319b355fb038412d -r737cc70566681417d5a0fab6f9ab7b4c953a44c0
--- library/nx/nx.tcl	(.../nx.tcl)	(revision aaced4467cdf9fd24e428c1a319b355fb038412d)
+++ library/nx/nx.tcl	(.../nx.tcl)	(revision 737cc70566681417d5a0fab6f9ab7b4c953a44c0)
@@ -20,7 +20,7 @@
     -object.configure configure
     -object.defaultmethod defaultmethod 
     -object.destroy destroy 
-    -object.init init 
+    -object.init init
     -object.move move 
     -object.objectparameter objectparameter 
     -object.residualargs residualargs
@@ -38,7 +38,9 @@
   #
   foreach cmd [info command ::nsf::methods::object::*] {
     set cmdName [namespace tail $cmd]
-    if {$cmdName in [list "autoname" "exists" "filterguard" "instvar" "mixinguard" "requirenamespace"]} continue
+    if {$cmdName in [list "autoname" "cleanup" "exists" \
+			 "filterguard" "instvar" "mixinguard" \
+			 "requirenamespace"]} continue
     ::nsf::alias Object $cmdName $cmd 
   }
   
@@ -63,7 +65,7 @@
 
   # set a few aliases as protected
   # "__next", if defined, should be added as well
-  foreach cmd [list cleanup noinit residualargs uplevel upvar] {
+  foreach cmd [list noinit residualargs uplevel upvar] {
     ::nsf::methodproperty Object $cmd call-protected 1
   }
 
@@ -1031,16 +1033,16 @@
     ::nx::RelationSlot create ${os}::Class::slot::superclass
     ::nsf::alias              ${os}::Class::slot::superclass assign ::nsf::relation
 
-    ::nx::RelationSlot create ${os}::Object::slot::class -multivalued false
-    ::nsf::alias              ${os}::Object::slot::class assign ::nsf::relation
+    #::nx::RelationSlot create ${os}::Object::slot::class -multivalued false
+    #::nsf::alias              ${os}::Object::slot::class assign ::nsf::relation
+    ::nsf::forward ${os}::Object class ::nsf::relation %self class
 
     ::nx::RelationSlot create ${os}::Object::slot::mixin \
 	-methodname object-mixin    
 
     ::nx::RelationSlot create ${os}::Object::slot::filter -elementtype "" \
 	-methodname object-filter
 
-
     ::nx::RelationSlot create ${os}::Class::slot::mixin -methodname class-mixin
     
     ::nx::RelationSlot create ${os}::Class::slot::filter -elementtype "" \
@@ -1574,7 +1576,7 @@
   set ::nsf::parametersyntax(::nsf::classes::nx::Object::mixin) $value
   set ::nsf::parametersyntax(::nsf::classes::nx::Class::mixin) $value
   set ::nsf::parametersyntax(::nsf::classes::nx::Class::superclass) $value
-  set ::nsf::parametersyntax(::nsf::classes::nx::Object::class) "?class?"
+  set ::nsf::parametersyntax(::nsf::classes::nx::Object::class) "?className?"
   set value "?filters?|?add filter?|?delete filter?"
   set ::nsf::parametersyntax(::nsf::classes::nx::Object::filter) $value
   set ::nsf::parametersyntax(::nsf::classes::nx::Class::filter) $value