Index: generic/predefined.h
===================================================================
diff -u -r555e7f84db642cb7f4d77c8a5189922e1287b3d4 -rfad871fc9a27570119d6bf9dbed84b7469701bd6
--- generic/predefined.h	(.../predefined.h)	(revision 555e7f84db642cb7f4d77c8a5189922e1287b3d4)
+++ generic/predefined.h	(.../predefined.h)	(revision fad871fc9a27570119d6bf9dbed84b7469701bd6)
@@ -205,10 +205,10 @@
 "if {[$slot exists type]} {\n"
 "lappend opts [$slot type]}\n"
 "if {[$slot exists default]} {\n"
-"set arg [$slot set default]\n"
+"set arg [::xotcl::setinstvar $slot default]\n"
 "if {[string match {*\\[*\\]*} $arg]} {\n"
 "lappend opts substdefault}} elseif {[$slot exists initcmd]} {\n"
-"set arg [$slot set initcmd]\n"
+"set arg [::xotcl::setinstvar $slot initcmd]\n"
 "lappend opts initcmd}\n"
 "if {[llength $opts] > 0} {\n"
 "append parameterdefinition :[join $opts ,]}\n"
@@ -263,12 +263,12 @@
 "if {![set .multivalued]} {\n"
 "error \"Property $prop of [set .domain]->$obj ist not multivalued\"}\n"
 "if {[$obj exists $prop]} {\n"
-"$obj set $prop [linsert [$obj set $prop] $pos $value]} else {\n"
-"$obj set $prop [list $value]}}\n"
+"::xotcl::setinstvar $obj $prop [linsert [::xotcl::setinstvar $obj $prop] $pos $value]} else {\n"
+"::xotcl::setinstvar $obj $prop [list $value]}}\n"
 "::xotcl::Slot method delete {-nocomplain:switch obj prop value} {\n"
-"set old [$obj set $prop]\n"
+"set old [::xotcl::setinstvar $obj $prop]\n"
 "set p [lsearch -glob $old $value]\n"
-"if {$p>-1} {$obj set $prop [lreplace $old $p $p]} else {\n"
+"if {$p>-1} {::xotcl::setinstvar $obj $prop [lreplace $old $p $p]} else {\n"
 "error \"$value is not a $prop of $obj (valid are: $old)\"}}\n"
 "::xotcl::Slot method unknown {method args} {\n"
 "set methods [list]\n"
@@ -345,24 +345,24 @@
 "valuechangedcmd}\n"
 "::xotcl::Attribute method __default_from_cmd {obj cmd var sub op} {\n"
 "$obj trace remove variable $var $op [list [::xotcl::self] [::xotcl::self proc] $obj $cmd]\n"
-"$obj set $var [$obj eval $cmd]}\n"
+"::xotcl::setinstvar $obj $var [$obj eval $cmd]}\n"
 "::xotcl::Attribute method __value_from_cmd {obj cmd var sub op} {\n"
-"$obj set $var [$obj eval $cmd]}\n"
+"::xotcl::setinstvar $obj $var [$obj eval $cmd]}\n"
 "::xotcl::Attribute method __value_changed_cmd {obj cmd var sub op} {\n"
 "eval $cmd}\n"
 "::xotcl::Attribute method check_single_value {\n"
 "{-keep_old_value:boolean true}\n"
 "value predicate type obj var} {\n"
 "if {![expr $predicate]} {\n"
 "if {[$obj exists __oldvalue($var)]} {\n"
-"$obj set $var [$obj set __oldvalue($var)]} else {\n"
+"::xotcl::setinstvar $obj $var [::xotcl::setinstvar $obj __oldvalue($var)]} else {\n"
 "$obj unset -nocomplain $var}\n"
 "error \"'$value' is not of type $type\"}\n"
-"if {$keep_old_value} {$obj set __oldvalue($var) $value}}\n"
+"if {$keep_old_value} {::xotcl::setinstvar $obj __oldvalue($var) $value}}\n"
 "::xotcl::Attribute method check_multiple_values {values predicate type obj var} {\n"
 "foreach value $values {\n"
 ".check_single_value -keep_old_value false $value $predicate $type $obj $var}\n"
-"$obj set __oldvalue($var) $value}\n"
+"::xotcl::setinstvar $obj __oldvalue($var) $value}\n"
 "::xotcl::Attribute method mk_type_checker {} {\n"
 "set __initcmd \"\"\n"
 "if {[.exists type]} {\n"
@@ -372,7 +372,7 @@
 "set predicate \"\\[${.type} \\$value\\]\"} else {\n"
 "set predicate \"\\[.type=${.type} ${.name} \\$value\\]\"}\n"
 "append .valuechangedcmd [subst {\n"
-"[expr {${.multivalued} ? \".check_multiple_values\" : \".check_single_value\"}] \\[\\$obj set ${.name}\\] \\\n"
+"[expr {${.multivalued} ? \".check_multiple_values\" : \".check_single_value\"}] \\[::xotcl::setinstvar \\$obj ${.name}\\] \\\n"
 "{$predicate} [list ${.type}] \\$obj ${.name}}]\n"
 "append __initcmd [subst -nocommands {\n"
 "if {[.exists ${.name}]} {set .__oldvalue(${.name}) [set .${.name}]}\\n}]}\n"
@@ -464,8 +464,8 @@
 "set po ::xotcl::Class::Parameter\n"
 "puts stderr \"deprecated parameter usage '$arg'; use '-slots {Attribute ...}' instead\"\n"
 "set cl [::xotcl::self]\n"
-"$po set name $name\n"
-"$po set cl [::xotcl::self]\n"
+"::xotcl::setinstvar $po name $name\n"
+"::xotcl::setinstvar $po cl [::xotcl::self]\n"
 "::eval $po configure [lrange $arg 1 end]\n"
 "if {[$po exists extra] || [$po exists setter] ||\n"
 "[$po exists getter] || [$po exists access]} {\n"
@@ -482,7 +482,7 @@
 "foreach instvar {extra defaultParam setter getter access} {\n"
 "$po unset -nocomplain $instvar}} else {\n"
 ".instparametercmd $name}}}\n"
-"[::xotcl::self]::slot set __parameter $arglist}\n"
+"::xotcl::setinstvar [::xotcl::self]::slot __parameter $arglist}\n"
 "::xotcl::Object method self {} {::xotcl::self}\n"
 "::xotcl::Object method defaultmethod {} {\n"
 "return [::xotcl::self]}\n"