Index: generic/nsf.c
===================================================================
diff -u -r10f06c20b9fe60805fd945e7caa4133784fa62ad -r6f3bbd8fb0eecf44cdeb730de9a710c2f1411165
--- generic/nsf.c	(.../nsf.c)	(revision 10f06c20b9fe60805fd945e7caa4133784fa62ad)
+++ generic/nsf.c	(.../nsf.c)	(revision 6f3bbd8fb0eecf44cdeb730de9a710c2f1411165)
@@ -34660,7 +34660,7 @@
 
     Tcl_ListObjLength(interp, varList, &length);
     for (i = 0; i < length; i++) {
-      Tcl_ListObjIndex(interp, varList, (TCL_SIZE_T)i, &element);
+      Tcl_ListObjIndex(interp, varList, i, &element);
       if (VarExists(interp, object, ObjStr(element), NULL, NSF_VAR_REQUIRE_DEFINED)) {
         Tcl_ListObjAppendElement(interp, okList, element);
       } else {
Index: generic/nsf.h
===================================================================
diff -u -r4b2efda0a1763efec35ed06f4f6b216c9ac2b2bd -r6f3bbd8fb0eecf44cdeb730de9a710c2f1411165
--- generic/nsf.h	(.../nsf.h)	(revision 4b2efda0a1763efec35ed06f4f6b216c9ac2b2bd)
+++ generic/nsf.h	(.../nsf.h)	(revision 6f3bbd8fb0eecf44cdeb730de9a710c2f1411165)
@@ -131,7 +131,7 @@
 #ifdef PRE9
 # define TCL_SIZE_T int
 #else
-# define TCL_SIZE_T size_t
+# define TCL_SIZE_T Tcl_Size
 #endif
 
 #ifndef TCL_INDEX_NONE
Index: generic/nsfInt.h
===================================================================
diff -u -r745c46b4619253f283fe4285d1f4a83375e3d9d7 -r6f3bbd8fb0eecf44cdeb730de9a710c2f1411165
--- generic/nsfInt.h	(.../nsfInt.h)	(revision 745c46b4619253f283fe4285d1f4a83375e3d9d7)
+++ generic/nsfInt.h	(.../nsfInt.h)	(revision 6f3bbd8fb0eecf44cdeb730de9a710c2f1411165)
@@ -354,13 +354,8 @@
 # include <alloca.h>
 #endif
 
-#ifdef PRE9
-# define NSF_PLAUSIBLE_REFCOUNT(A) ((A)->refCount >= 0)
-# define NSF_PLAUSIBLE_LENGTH(A) ((A)->length >= 0)
-#else
-# define NSF_PLAUSIBLE_REFCOUNT(A) ((A)->refCount < (size_t)-100)
-# define NSF_PLAUSIBLE_LENGTH(A) ((A)->length < (size_t)-100)
-#endif
+#define NSF_PLAUSIBLE_REFCOUNT(A) ((A)->refCount >= 0)
+#define NSF_PLAUSIBLE_LENGTH(A) ((A)->length >= 0)
 
 #if !defined(NDEBUG)
 # define ISOBJ(o) ((o) != NULL && ISOBJ_(o))