Index: generic/nsfInt.h
===================================================================
diff -u -rb70d9bb2e0b19e3cb5f397a4b168d79d3047ceb9 -r404ad6bfcb313983a0cc54d3323751008bca991b
--- generic/nsfInt.h	(.../nsfInt.h)	(revision b70d9bb2e0b19e3cb5f397a4b168d79d3047ceb9)
+++ generic/nsfInt.h	(.../nsfInt.h)	(revision 404ad6bfcb313983a0cc54d3323751008bca991b)
@@ -339,18 +339,20 @@
 /* FILTER_ORDER_DEFINED set, when filters are defined for obj */
 #define NSF_FILTER_ORDER_DEFINED           0x0020
 #define NSF_FILTER_ORDER_DEFINED_AND_VALID 0x0030
-/* CLASS properties for objects */
+/* class and object properties for objects */
 #define NSF_IS_CLASS                       0x0040
 #define NSF_IS_ROOT_META_CLASS             0x0080
 #define NSF_IS_ROOT_CLASS                  0x0100
-
-#define NSF_TCL_DELETE                     0x0200
-#define NSF_DESTROY_CALLED_SUCCESS         0x0400
+#define NSF_IS_SLOT_CONTAINER              0x0200
+/* deletion state */
+#define NSF_TCL_DELETE                     0x0400
+#define NSF_DESTROY_CALLED_SUCCESS         0x0800
 /*#define NSF_CMD_NOT_FOUND                  0x1000*/
 #define NSF_DURING_DELETE                  0x2000
 #define NSF_DELETED                        0x4000
 #define NSF_RECREATE                       0x8000
 
+
 /* flags for NsfParams */
 
 #define NSF_ARG_REQUIRED		0x0001
@@ -446,7 +448,7 @@
   Tcl_Command id;
   Tcl_Interp *teardown;
   struct NsfClass *cl;
-  TclVarHashTable *varTable;
+  TclVarHashTable *varTablePtr;
   Tcl_Namespace *nsPtr;
   NsfObjectOpt *opt;
   struct NsfCmdList *filterOrder;