Index: generic/predefined.h
===================================================================
diff -u -rcfee325944ac90fe94485cba109a7e99465073b5 -r147831f1098cb9b96a28d4d5b0f9f3ccea35b9da
--- generic/predefined.h	(.../predefined.h)	(revision cfee325944ac90fe94485cba109a7e99465073b5)
+++ generic/predefined.h	(.../predefined.h)	(revision 147831f1098cb9b96a28d4d5b0f9f3ccea35b9da)
@@ -442,10 +442,10 @@
 "proc createBootstrapAttributeSlots {} {}}\n"
 "::xotcl2::Class create ::xotcl::ScopedNew -superclass ::xotcl2::Class -parameter {\n"
 "{withclass ::xotcl2::Object}\n"
-"inobject}\n"
+"container}\n"
 "::xotcl::ScopedNew protected method init {} {\n"
 ":public method new {-childof args} {\n"
-"::xotcl::importvar [::xotcl::self class] {inobject object} withclass\n"
+"::xotcl::importvar [::xotcl::self class] {container object} withclass\n"
 "if {![::xotcl::is $object object]} {\n"
 "$withclass create $object}\n"
 "eval ::xotcl::next -childof $object $args}}\n"
@@ -458,11 +458,13 @@
 "if {![::xotcl::is $object object]} {$class create $object}\n"
 "$object requireNamespace\n"
 "if {$withnew} {\n"
-"set m [::xotcl::ScopedNew new \\\n"
-"-inobject $object -withclass $class -volatile]\n"
+"set m [::xotcl::ScopedNew new -volatile \\\n"
+"-container $object -withclass $class]\n"
 "::xotcl2::Class mixin add $m end\n"
+"if {[::xotcl::is ::xotcl::Class class]} {::xotcl::Class instmixin add $m end}\n"
 "namespace eval $object $cmds\n"
-"::xotcl2::Class mixin delete $m} else {\n"
+"::xotcl2::Class mixin delete $m\n"
+"if {[::xotcl::is ::xotcl::Class class]} {::xotcl::Class instmixin delete $m}} else {\n"
 "namespace eval $object $cmds}}\n"
 "::xotcl2::Class forward slots %self contains \\\n"
 "-object {%::xotcl::dispatch [::xotcl::self] -objscope ::subst [::xotcl::self]::slot}\n"