Index: generic/predefined.h
===================================================================
diff -u -r2454ab78913d0686b2ec5feeb401a051dc6a6164 -rd70c849219212800fa401c2227796b9a63eadcaf
--- generic/predefined.h	(.../predefined.h)	(revision 2454ab78913d0686b2ec5feeb401a051dc6a6164)
+++ generic/predefined.h	(.../predefined.h)	(revision d70c849219212800fa401c2227796b9a63eadcaf)
@@ -21,13 +21,11 @@
 "::xotcl::methodproperty Class  dealloc redefine-protected true\n"
 "::xotcl::methodproperty Class  create  redefine-protected true\n"
 "::xotcl::dispatch Class ::xotcl::cmd::Class::class-method method {\n"
-"-per-object:switch\n"
 "name arguments body -precondition -postcondition} {\n"
 "set conditions [list]\n"
 "if {[info exists precondition]}  {lappend conditions -precondition  $precondition}\n"
 "if {[info exists postcondition]} {lappend conditions -postcondition $postcondition}\n"
-"set cls [expr {${per-object} ? \"Object\" : \"Class\"}]\n"
-"::xotcl::dispatch [self] ::xotcl::cmd::${cls}::[string tolower $cls]-method \\\n"
+"::xotcl::dispatch [self] ::xotcl::cmd::Class::class-method \\\n"
 "$name $arguments $body {*}$conditions}\n"
 "::xotcl::dispatch Object ::xotcl::cmd::Class::class-method method {\n"
 "name arguments body -precondition -postcondition} {\n"
@@ -43,7 +41,10 @@
 "if {$what in [list \"info\"]} {\n"
 "return [::xotcl2::objectInfo [lindex $args 0] [self] {*}[lrange $args 1 end]]}\n"
 "if {$what in [list \"filter\" \"mixin\"]} {\n"
-"return [.object-$what {*}$args]}}\n"
+"puts stderr \"call .object-$what {*}$args\"\n"
+"return [.object-$what {*}$args]}\n"
+"if {$what in [list \"filterguard\" \"mixinguard\"]} {\n"
+"return [::xotcl::dispatch [self] ::xotcl::cmd::Object::$what {*}$args]}}\n"
 ".method unknown {m args} {\n"
 "error \"Method '$m' unknown for [self].\\\n"
 "Consider '[self] create $m $args' instead of '[self] $m $args'\"}}\n"
@@ -72,10 +73,9 @@
 "-per-object \\\n"
 "{*}[expr {${objscope} ? \"-objscope\" : \"\"}] \\\n"
 "$cmd}\n"
-"Class public method alias {-objscope:switch -per-object:switch methodName cmd} {\n"
+"Class public method alias {-objscope:switch methodName cmd} {\n"
 "::xotcl::alias [self] $methodName \\\n"
 "{*}[expr {${objscope} ? \"-objscope\" : \"\"}] \\\n"
-"{*}[expr {${per-object} ? \"-per-object\" : \"\"}] \\\n"
 "$cmd}\n"
 "Object public method setter {methodName value:optional} {\n"
 "if {[info exists value]} {\n"