Index: generic/xotcl.c
===================================================================
diff -u -r7050a52ac53992d9a3aec12e48b0fa58a26449e6 -r6db1260f0b59b82fa839fdd841138c413ce00c8b
--- generic/xotcl.c	(.../xotcl.c)	(revision 7050a52ac53992d9a3aec12e48b0fa58a26449e6)
+++ generic/xotcl.c	(.../xotcl.c)	(revision 6db1260f0b59b82fa839fdd841138c413ce00c8b)
@@ -10676,11 +10676,37 @@
 
   return TCL_OK;
 }
-static int GetInstvarsIntoCurrentScope(Tcl_Interp *interp, XOTclObject *obj, int objc, Tcl_Obj *CONST objv[]);
 
 static int
 XOTclImportvarCmd(Tcl_Interp *interp, XOTclObject *object, int objc, Tcl_Obj *CONST objv[]) {
-  return GetInstvarsIntoCurrentScope(interp, object, objc, objv);
+  int i, result = TCL_OK;
+
+  for (i=1; i<objc; i++) {
+    Tcl_Obj  **ov;
+    int oc;
+
+    /*fprintf(stderr, "ListGetElements %p %s\n", objv[i], ObjStr(objv[i]));*/
+    if ((result = Tcl_ListObjGetElements(interp, objv[i], &oc, &ov)) == TCL_OK) {
+      Tcl_Obj *varname = NULL, *alias = NULL;
+      switch (oc) {
+      case 0: {varname = objv[i]; break;}
+      case 1: {varname = ov[0];   break;}
+      case 2: {varname = ov[0];   alias = ov[1]; break;}
+      }
+      if (varname) {
+        result = GetInstVarIntoCurrentScope(interp, object, varname, alias);
+      } else {
+        result = XOTclVarErrMsg(interp, "invalid variable specification '",
+                                ObjStr(objv[i]), "'", (char *) NULL);
+      }
+      if (result != TCL_OK) {
+        break;	
+      }
+    } else {
+      break;
+    }
+  }
+  return result;
 }
 
 /* create a slave interp that calls XOTcl Init */
@@ -10957,7 +10983,7 @@
     if (cmd) {
       /*fprintf(stderr, "%s already exists\n", newName);*/
       if (!XOTclpGetObject(interp, newName)) {
-        /* command or instproc will be deleted & then copied */
+        /* command or scripted method will be deleted & then copied */
         Tcl_DeleteCommandFromToken(interp, cmd);
       } else {
         /* don't overwrite objects -> will be recreated */
@@ -11016,10 +11042,10 @@
               DECR_REF_COUNT(newFullCmdName);
               DECR_REF_COUNT(oldFullCmdName);
               DECR_REF_COUNT(arglistObj);
-              return XOTclVarErrMsg(interp, "No class for inst - assertions", (char *) NULL);
+              return XOTclVarErrMsg(interp, "No class for class - assertions", (char *) NULL);
             }
 
-            /* XOTcl InstProc */
+            /* XOTcl class-methods */
             DSTRING_INIT(dsPtr);
             Tcl_DStringAppendElement(dsPtr, NSCutXOTclClasses(toNsPtr->fullName));
             Tcl_DStringAppendElement(dsPtr, "instproc");
@@ -11958,37 +11984,6 @@
   return TCL_OK;
 }
 
-static int GetInstvarsIntoCurrentScope(Tcl_Interp *interp, XOTclObject *obj, int objc, Tcl_Obj *CONST objv[]) {
-  int i, result = TCL_OK;
-
-  for (i=1; i<objc; i++) {
-    Tcl_Obj  **ov;
-    int oc;
-
-    /*fprintf(stderr, "ListGetElements %p %s\n", objv[i], ObjStr(objv[i]));*/
-    if ((result = Tcl_ListObjGetElements(interp, objv[i], &oc, &ov)) == TCL_OK) {
-      Tcl_Obj *varname = NULL, *alias = NULL;
-      switch (oc) {
-      case 0: {varname = objv[i]; break;}
-      case 1: {varname = ov[0];   break;}
-      case 2: {varname = ov[0];   alias = ov[1]; break;}
-      }
-      if (varname) {
-        result = GetInstVarIntoCurrentScope(interp, obj, varname, alias);
-      } else {
-        result = XOTclVarErrMsg(interp, "invalid variable specification '",
-                                ObjStr(objv[i]), "'", (char *) NULL);
-      }
-      if (result != TCL_OK) {
-        break;	
-      }
-    } else {
-      break;
-    }
-  }
-  return result;
-}
-
 static int XOTclOInstVarMethod(Tcl_Interp *interp, XOTclObject *obj, int objc, Tcl_Obj *CONST objv[]) {
   callFrameContext ctx = {0};
   int result;
@@ -12003,7 +11998,7 @@
 			  (char *) NULL);
   }
 
-  result = GetInstvarsIntoCurrentScope(interp, obj, objc, objv);
+  result = XOTclImportvarCmd(interp, obj, objc, objv);
   CallStackRestoreSavedFrames(interp, &ctx);
   return result;
 }