Index: generic/predefined.h
===================================================================
diff -u -rd16b1ff12a9ab1dd196bbdb33510ad94959155b3 -r091d3c94b06fd94c8e2bf39f806c43483909e2af
--- generic/predefined.h	(.../predefined.h)	(revision d16b1ff12a9ab1dd196bbdb33510ad94959155b3)
+++ generic/predefined.h	(.../predefined.h)	(revision 091d3c94b06fd94c8e2bf39f806c43483909e2af)
@@ -515,11 +515,11 @@
 "$obj requireNamespace}} else {\n"
 "namespace eval $dest {}}\n"
 ":copyNSVarsAndCmds $origin $dest\n"
-"foreach i [$origin info forward] {\n"
-"eval [concat $dest forward $i [$origin info forward -definition $i]]}\n"
+"foreach i [::xotcl::cmd::ObjectInfo::forward $origin] {\n"
+"eval [concat ::xotcl::forward $dest -per-object $i [::xotcl::cmd::ObjectInfo::forward $origin -definition $i]]}\n"
 "if {[::xotcl::objectproperty $origin class]} {\n"
-"foreach i [$origin info instforward] {\n"
-"eval [concat $dest instforward $i [$origin info instforward -definition $i]]}}\n"
+"foreach i [::xotcl::cmd::ClassInfo::forward $origin] {\n"
+"eval [concat ::xotcl::forward $dest $i [::xotcl::cmd::ClassInfo::forward $origin -definition $i]]}}\n"
 "set traces [list]\n"
 "foreach var [$origin info vars] {\n"
 "set cmds [::xotcl::dispatch $origin -objscope ::trace info variable $var]\n"