Index: generic/asm/asmAssembleTemplate.c
===================================================================
diff -u -r84ebec01747d68ec9ab8310c0aba7dfd6a2af522 -rfcfefac791a3baf9193ab0a39f782dcd0d74b522
--- generic/asm/asmAssembleTemplate.c	(.../asmAssembleTemplate.c)	(revision 84ebec01747d68ec9ab8310c0aba7dfd6a2af522)
+++ generic/asm/asmAssembleTemplate.c	(.../asmAssembleTemplate.c)	(revision fcfefac791a3baf9193ab0a39f782dcd0d74b522)
@@ -42,7 +42,7 @@
 
 static AsmStatementInfo asmStatementInfo[] = {
   /* asmObjProcIdx, */
-  {ASM_INFO_PAIRS|ASM_INFO_SKIP1, NULL, 2, -1, NR_PAIRS1},
+  {ASM_INFO_PAIRS|ASM_INFO_SKIP1, NULL, 2, TCL_INDEX_NONE, NR_PAIRS1},
   $STATEMENT_INFO
 };
 
@@ -108,13 +108,13 @@
 			   ObjStr(lineObj));
     }
 
-    if (asmStatementInfo[index].minArgs > -1
+    if (asmStatementInfo[index].minArgs != TCL_INDEX_NONE
 	&& wordOc < asmStatementInfo[index].minArgs) {
       return NsfPrintError(interp, "Asm: statement must contain at least %d words: %s",
 			   asmStatementInfo[index].minArgs, ObjStr(lineObj));
     }
 
-    if (asmStatementInfo[index].maxArgs > -1
+    if (asmStatementInfo[index].maxArgs != TCL_INDEX_NONE
 	&& wordOc > asmStatementInfo[index].maxArgs) {
       return NsfPrintError(interp, "Asm: statement must contain at most %d words: %s",
 			   asmStatementInfo[index].maxArgs, ObjStr(lineObj));
Index: generic/asm/nsfAsmAssemble.c
===================================================================
diff -u -r84ebec01747d68ec9ab8310c0aba7dfd6a2af522 -rfcfefac791a3baf9193ab0a39f782dcd0d74b522
--- generic/asm/nsfAsmAssemble.c	(.../nsfAsmAssemble.c)	(revision 84ebec01747d68ec9ab8310c0aba7dfd6a2af522)
+++ generic/asm/nsfAsmAssemble.c	(.../nsfAsmAssemble.c)	(revision fcfefac791a3baf9193ab0a39f782dcd0d74b522)
@@ -82,9 +82,9 @@
 
 static AsmStatementInfo asmStatementInfo[] = {
   /* asmObjProcIdx, */
-  {ASM_INFO_PAIRS|ASM_INFO_SKIP1, NULL, 2, -1, NR_PAIRS1},
+  {ASM_INFO_PAIRS|ASM_INFO_SKIP1, NULL, 2, TCL_INDEX_NONE, NR_PAIRS1},
   /* asmEval */
-  {0|ASM_INFO_PAIRS, asmStatementCmdType, 3, -1, NR_PAIRS},
+  {0|ASM_INFO_PAIRS, asmStatementCmdType, 3, TCL_INDEX_NONE, NR_PAIRS},
   /* asmDuplicateObj */
   {0|ASM_INFO_PAIRS, asmStatementSlotObjArgType, 5, 5, 2},
   /* asmIncrInt */
@@ -102,9 +102,9 @@
   /* asmLeIntObj */
   {0|ASM_INFO_PAIRS, asmStatementSlotType, 5, 5, 2},
   /* asmMethodDelegateDispatch */
-  {0|ASM_INFO_PAIRS, asmStatementCmdType, 5, -1, NR_PAIRS},
+  {0|ASM_INFO_PAIRS, asmStatementCmdType, 5, TCL_INDEX_NONE, NR_PAIRS},
   /* asmMethodSelfDispatch */
-  {0|ASM_INFO_PAIRS, asmStatementCmdType, 3, -1, NR_PAIRS},
+  {0|ASM_INFO_PAIRS, asmStatementCmdType, 3, TCL_INDEX_NONE, NR_PAIRS},
   /* asmNoop */
   {0, NULL, 1, 1, 0},
   /* asmObj */
@@ -189,13 +189,13 @@
 			   ObjStr(lineObj));
     }
 
-    if (asmStatementInfo[index].minArgs > -1
+    if (asmStatementInfo[index].minArgs != TCL_INDEX_NONE
 	&& wordOc < asmStatementInfo[index].minArgs) {
       return NsfPrintError(interp, "Asm: statement must contain at least %d words: %s",
 			   asmStatementInfo[index].minArgs, ObjStr(lineObj));
     }
 
-    if (asmStatementInfo[index].maxArgs > -1
+    if (asmStatementInfo[index].maxArgs != TCL_INDEX_NONE
 	&& wordOc > asmStatementInfo[index].maxArgs) {
       return NsfPrintError(interp, "Asm: statement must contain at most %d words: %s",
 			   asmStatementInfo[index].maxArgs, ObjStr(lineObj));
Index: generic/asm/nsfAssemble.c
===================================================================
diff -u -r42dbfd5df1fa6248468d00c7d68fd699a5a69e64 -rfcfefac791a3baf9193ab0a39f782dcd0d74b522
--- generic/asm/nsfAssemble.c	(.../nsfAssemble.c)	(revision 42dbfd5df1fa6248468d00c7d68fd699a5a69e64)
+++ generic/asm/nsfAssemble.c	(.../nsfAssemble.c)	(revision fcfefac791a3baf9193ab0a39f782dcd0d74b522)
@@ -23,8 +23,8 @@
 typedef struct AsmStatementInfo {
   int flags;
   CONST char **argTypes;
-  int minArgs;
-  int maxArgs;
+  TCL_SIZE_T minArgs;
+  TCL_SIZE_T maxArgs;
   int cArgs;
 } AsmStatementInfo;
 
Index: generic/nsfCompile.c
===================================================================
diff -u -r30e90f77c00ffc280245a7f61ae2a8854c546ed8 -rfcfefac791a3baf9193ab0a39f782dcd0d74b522
--- generic/nsfCompile.c	(.../nsfCompile.c)	(revision 30e90f77c00ffc280245a7f61ae2a8854c546ed8)
+++ generic/nsfCompile.c	(.../nsfCompile.c)	(revision fcfefac791a3baf9193ab0a39f782dcd0d74b522)
@@ -81,7 +81,7 @@
   if (parsePtr->numWords != 1) {
 	Tcl_ResetResult(interp);
 	Tcl_AppendToObj(Tcl_GetObjResult(interp),
-	        "wrong # args: should be '::nsf::initProcNS'", -1);
+	        "wrong # args: should be '::nsf::initProcNS'", TCL_INDEX_NONE);
 	envPtr->maxStackDepth = 0;
 	return TCL_ERROR;
     }