Merge 8.7

14 files changed, 177 insertions, 329 deletions

diff --git a/generic/tclAlloc.c b/generic/tclAlloc.c
index f7b056c..8e3d3b8 100644
--- a/generic/tclAlloc.c
+++ b/generic/tclAlloc.c
@@ -580,7 +580,7 @@ TclpRealloc(
 #endif
 
 	Tcl_MutexUnlock(allocMutexPtr);
-	return (char *)(overPtr+1);
+	return (void *)(overPtr+1);
     }
     maxSize = 1 << (i+3);
     expensive = 0;
diff --git a/generic/tclCkalloc.c b/generic/tclCkalloc.c
index b961bf6..938bd8e 100644
--- a/generic/tclCkalloc.c
+++ b/generic/tclCkalloc.c
@@ -631,7 +631,7 @@ Tcl_DbCkfree(
 
     if (memp->tagPtr != NULL) {
 	if ((memp->tagPtr->refCount-- <= 1) && (curTagPtr != memp->tagPtr)) {
-	    TclpFree((char *) memp->tagPtr);
+	    TclpFree(memp->tagPtr);
 	}
     }
 
@@ -648,7 +648,7 @@ Tcl_DbCkfree(
     if (allocHead == memp) {
 	allocHead = memp->flink;
     }
-    TclpFree((char *) memp);
+    TclpFree(memp);
     Tcl_MutexUnlock(ckallocMutexPtr);
 }
 
@@ -859,7 +859,7 @@ MemoryCmd(
 	    return TCL_ERROR;
 	}
 	if ((curTagPtr != NULL) && (curTagPtr->refCount == 0)) {
-	    TclpFree((char *) curTagPtr);
+	    TclpFree(curTagPtr);
 	}
 	len = strlen(TclGetString(objv[2]));
 	curTagPtr = (MemTag *) TclpAlloc(TAG_SIZE(len));
@@ -1047,7 +1047,7 @@ void *
 Tcl_AttemptAlloc(
     size_t size)
 {
-    return TclpAlloc(size);
+    return (char *)TclpAlloc(size);
 }
 
 void *
@@ -1056,7 +1056,7 @@ Tcl_AttemptDbCkalloc(
     TCL_UNUSED(const char *) /*file*/,
     TCL_UNUSED(int) /*line*/)
 {
-    return TclpAlloc(size);
+    return (char *)TclpAlloc(size);
 }
 
 /*
@@ -1117,7 +1117,7 @@ Tcl_AttemptRealloc(
     void *ptr,
     size_t size)
 {
-    return TclpRealloc(ptr, size);
+    return (char *)TclpRealloc(ptr, size);
 }
 
 void *
@@ -1127,7 +1127,7 @@ Tcl_AttemptDbCkrealloc(
     TCL_UNUSED(const char *) /*file*/,
     TCL_UNUSED(int) /*line*/)
 {
-    return TclpRealloc(ptr, size);
+    return (char *)TclpRealloc(ptr, size);
 }
 
 /*
@@ -1232,7 +1232,7 @@ TclFinalizeMemorySubsystem(void)
     Tcl_MutexLock(ckallocMutexPtr);
 
     if (curTagPtr != NULL) {
-	TclpFree((char *) curTagPtr);
+	TclpFree(curTagPtr);
 	curTagPtr = NULL;
     }
     allocHead = NULL;
diff --git a/generic/tclLink.c b/generic/tclLink.c
index 6be0de1..29c9473 100644
--- a/generic/tclLink.c
+++ b/generic/tclLink.c
@@ -628,12 +628,11 @@ IsSpecial(
 
 static int
 SetInvalidRealFromAny(
-    Tcl_Interp *dummy,
+    TCL_UNUSED(Tcl_Interp *),
     Tcl_Obj *objPtr)
 {
     size_t length;
     const char *str, *endPtr;
-    (void)dummy;
 
     str = TclGetStringFromObj(objPtr, &length);
     if ((length == 1) && (str[0] == '.')) {
@@ -747,8 +746,11 @@ static char *
 LinkTraceProc(
     ClientData clientData,	/* Contains information about the link. */
     Tcl_Interp *interp,		/* Interpreter containing Tcl variable. */
-    const char *name1,		/* First part of variable name. */
-    const char *name2,		/* Second part of variable name. */
+    TCL_UNUSED(const char *) /*name1*/,
+    TCL_UNUSED(const char *) /*name2*/,
+				/* Links can only be made to global variables,
+				 * so we can find them with need to resolve
+				 * caller-supplied name in caller context. */
     int flags)			/* Miscellaneous additional information. */
 {
     Link *linkPtr = (Link *)clientData;
@@ -764,8 +766,6 @@ LinkTraceProc(
     int objc;
     Tcl_Obj **objv;
     int i;
-    (void)name1;
-    (void)name2;
 
     /*
      * If the variable is being unset, then just re-create it (with a trace)
diff --git a/generic/tclListObj.c b/generic/tclListObj.c
index f182bcb..3b1a5ca 100644
--- a/generic/tclListObj.c
+++ b/generic/tclListObj.c
@@ -309,13 +309,9 @@ Tcl_Obj *
 Tcl_DbNewListObj(
     int objc,			/* Count of objects referenced by objv. */
     Tcl_Obj *const objv[],	/* An array of pointers to Tcl objects. */
-    const char *file,		/* The name of the source file calling this
-				 * function; used for debugging. */
-    int line)			/* Line number in the source file; used for
-				 * debugging. */
+    TCL_UNUSED(const char *) /*file*/,
+    TCL_UNUSED(int) /*line*/)
 {
-    (void)file;
-    (void)line;
     return Tcl_NewListObj(objc, objv);
 }
 #endif /* TCL_MEM_DEBUG */
diff --git a/generic/tclLoad.c b/generic/tclLoad.c
index bc02a2e..f02cebc 100644
--- a/generic/tclLoad.c
+++ b/generic/tclLoad.c
@@ -115,7 +115,7 @@ static void		LoadCleanupProc(ClientData clientData,
 
 int
 Tcl_LoadObjCmd(
-    ClientData dummy,		/* Not used. */
+    TCL_UNUSED(ClientData),
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
@@ -140,7 +140,6 @@ Tcl_LoadObjCmd(
     enum options {
 	LOAD_GLOBAL,	LOAD_LAZY,	LOAD_LAST
     };
-    (void)dummy;
 
     while (objc > 2) {
 	if (TclGetString(objv[1])[0] != '-') {
@@ -541,7 +540,7 @@ Tcl_LoadObjCmd(
 
 int
 Tcl_UnloadObjCmd(
-    ClientData dummy,		/* Not used. */
+    TCL_UNUSED(ClientData),
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
@@ -561,7 +560,6 @@ Tcl_UnloadObjCmd(
     enum options {
 	UNLOAD_NOCOMPLAIN, UNLOAD_KEEPLIB, UNLOAD_LAST
     };
-    (void)dummy;
 
     for (i = 1; i < objc; i++) {
 	if (Tcl_GetIndexFromObj(interp, objv[i], options, "option", 0,
@@ -1152,10 +1150,9 @@ static void
 LoadCleanupProc(
     ClientData clientData,	/* Pointer to first InterpPackage structure
 				 * for interp. */
-    Tcl_Interp *dummy)		/* Interpreter that is being deleted. */
+    TCL_UNUSED(Tcl_Interp *))
 {
     InterpPackage *ipPtr, *nextPtr;
-    (void)dummy;
 
     ipPtr = (InterpPackage *)clientData;
     while (ipPtr != NULL) {
diff --git a/generic/tclMain.c b/generic/tclMain.c
index 8b8daf3..a25b250 100644
--- a/generic/tclMain.c
+++ b/generic/tclMain.c
@@ -735,7 +735,7 @@ TclFullFinalizationRequested(void)
 static void
 StdinProc(
     ClientData clientData,	/* The state of interactive cmd line */
-    int mask)			/* Not used. */
+    TCL_UNUSED(int) /*mask*/)
 {
     int code;
     size_t length;
@@ -743,7 +743,6 @@ StdinProc(
     Tcl_Channel chan = isPtr->input;
     Tcl_Obj *commandPtr = isPtr->commandPtr;
     Tcl_Interp *interp = isPtr->interp;
-    (void)mask;
 
     if (Tcl_IsShared(commandPtr)) {
 	Tcl_DecrRefCount(commandPtr);
diff --git a/generic/tclNamesp.c b/generic/tclNamesp.c
index 95ef4ad..ed6b61a 100644
--- a/generic/tclNamesp.c
+++ b/generic/tclNamesp.c
@@ -92,47 +92,27 @@ static int		GetNamespaceFromObj(Tcl_Interp *interp,
 			    Tcl_Obj *objPtr, Tcl_Namespace **nsPtrPtr);
 static int		InvokeImportedNRCmd(ClientData clientData,
 			    Tcl_Interp *interp,int objc,Tcl_Obj *const objv[]);
-static int		NamespaceChildrenCmd(ClientData dummy,
-			    Tcl_Interp *interp,int objc,Tcl_Obj *const objv[]);
-static int		NamespaceCodeCmd(ClientData dummy, Tcl_Interp *interp,
-			    int objc, Tcl_Obj *const objv[]);
-static int		NamespaceCurrentCmd(ClientData dummy,
-			    Tcl_Interp *interp,int objc,Tcl_Obj *const objv[]);
-static int		NamespaceDeleteCmd(ClientData dummy,Tcl_Interp *interp,
-			    int objc, Tcl_Obj *const objv[]);
-static int		NamespaceEvalCmd(ClientData dummy, Tcl_Interp *interp,
-			    int objc, Tcl_Obj *const objv[]);
-static int		NRNamespaceEvalCmd(ClientData dummy,
-			    Tcl_Interp *interp,int objc,Tcl_Obj *const objv[]);
-static int		NamespaceExistsCmd(ClientData dummy,Tcl_Interp *interp,
-			    int objc, Tcl_Obj *const objv[]);
-static int		NamespaceExportCmd(ClientData dummy,Tcl_Interp *interp,
-			    int objc, Tcl_Obj *const objv[]);
-static int		NamespaceForgetCmd(ClientData dummy,Tcl_Interp *interp,
-			    int objc, Tcl_Obj *const objv[]);
+static Tcl_ObjCmdProc	NamespaceChildrenCmd;
+static Tcl_ObjCmdProc	NamespaceCodeCmd;
+static Tcl_ObjCmdProc	NamespaceCurrentCmd;
+static Tcl_ObjCmdProc	NamespaceDeleteCmd;
+static Tcl_ObjCmdProc	NamespaceEvalCmd;
+static Tcl_ObjCmdProc	NRNamespaceEvalCmd;
+static Tcl_ObjCmdProc	NamespaceExistsCmd;
+static Tcl_ObjCmdProc	NamespaceExportCmd;
+static Tcl_ObjCmdProc	NamespaceForgetCmd;
 static void		NamespaceFree(Namespace *nsPtr);
-static int		NamespaceImportCmd(ClientData dummy,Tcl_Interp *interp,
-			    int objc, Tcl_Obj *const objv[]);
-static int		NamespaceInscopeCmd(ClientData dummy,
-			    Tcl_Interp *interp,int objc,Tcl_Obj *const objv[]);
-static int		NRNamespaceInscopeCmd(ClientData dummy,
-			    Tcl_Interp *interp,int objc,Tcl_Obj *const objv[]);
-static int		NamespaceOriginCmd(ClientData dummy,Tcl_Interp *interp,
-			    int objc, Tcl_Obj *const objv[]);
-static int		NamespaceParentCmd(ClientData dummy,Tcl_Interp *interp,
-			    int objc, Tcl_Obj *const objv[]);
-static int		NamespacePathCmd(ClientData dummy, Tcl_Interp *interp,
-			    int objc, Tcl_Obj *const objv[]);
-static int		NamespaceQualifiersCmd(ClientData dummy,
-			    Tcl_Interp *interp,int objc,Tcl_Obj *const objv[]);
-static int		NamespaceTailCmd(ClientData dummy, Tcl_Interp *interp,
-			    int objc, Tcl_Obj *const objv[]);
-static int		NamespaceUpvarCmd(ClientData dummy, Tcl_Interp *interp,
-			    int objc, Tcl_Obj *const objv[]);
-static int		NamespaceUnknownCmd(ClientData dummy,
-			    Tcl_Interp *interp,int objc,Tcl_Obj *const objv[]);
-static int		NamespaceWhichCmd(ClientData dummy, Tcl_Interp *interp,
-			    int objc, Tcl_Obj *const objv[]);
+static Tcl_ObjCmdProc	NamespaceImportCmd;
+static Tcl_ObjCmdProc	NamespaceInscopeCmd;
+static Tcl_ObjCmdProc	NRNamespaceInscopeCmd;
+static Tcl_ObjCmdProc	NamespaceOriginCmd;
+static Tcl_ObjCmdProc	NamespaceParentCmd;
+static Tcl_ObjCmdProc	NamespacePathCmd;
+static Tcl_ObjCmdProc	NamespaceQualifiersCmd;
+static Tcl_ObjCmdProc	NamespaceTailCmd;
+static Tcl_ObjCmdProc	NamespaceUpvarCmd;
+static Tcl_ObjCmdProc	NamespaceUnknownCmd;
+static Tcl_ObjCmdProc	NamespaceWhichCmd;
 static int		SetNsNameFromAny(Tcl_Interp *interp, Tcl_Obj *objPtr);
 static void		UnlinkNsPath(Namespace *nsPtr);
 
@@ -513,16 +493,12 @@ TclPopStackFrame(
 
 static char *
 EstablishErrorCodeTraces(
-    ClientData dummy,
+    TCL_UNUSED(ClientData),
     Tcl_Interp *interp,
-    const char *name1,
-    const char *name2,
-    int flags)
+    TCL_UNUSED(const char *) /*name1*/,
+    TCL_UNUSED(const char *) /*name2*/,
+    TCL_UNUSED(int) /*flags*/)
 {
-    (void)dummy;
-    (void)name1;
-    (void)name2;
-    (void)flags;
     Tcl_TraceVar2(interp, "errorCode", NULL, TCL_GLOBAL_ONLY|TCL_TRACE_READS,
 	    ErrorCodeRead, NULL);
     Tcl_TraceVar2(interp, "errorCode", NULL, TCL_GLOBAL_ONLY|TCL_TRACE_UNSETS,
@@ -549,17 +525,13 @@ EstablishErrorCodeTraces(
 
 static char *
 ErrorCodeRead(
-    ClientData dummy,
+    TCL_UNUSED(ClientData),
     Tcl_Interp *interp,
-    const char *name1,
-    const char *name2,
-    int flags)
+    TCL_UNUSED(const char *) /*name1*/,
+    TCL_UNUSED(const char *) /*name2*/,
+    TCL_UNUSED(int) /*flags*/)
 {
     Interp *iPtr = (Interp *) interp;
-    (void)dummy;
-    (void)name1;
-    (void)name2;
-    (void)flags;
 
     if (Tcl_InterpDeleted(interp) || !(iPtr->flags & ERR_LEGACY_COPY)) {
 	return NULL;
@@ -595,17 +567,12 @@ ErrorCodeRead(
 
 static char *
 EstablishErrorInfoTraces(
-    ClientData dummy,
+    TCL_UNUSED(ClientData),
     Tcl_Interp *interp,
-    const char *name1,
-    const char *name2,
-    int flags)
+    TCL_UNUSED(const char *) /*name1*/,
+    TCL_UNUSED(const char *) /*name2*/,
+    TCL_UNUSED(int) /*flags*/)
 {
-    (void)dummy;
-    (void)name1;
-    (void)name2;
-    (void)flags;
-
     Tcl_TraceVar2(interp, "errorInfo", NULL, TCL_GLOBAL_ONLY|TCL_TRACE_READS,
 	    ErrorInfoRead, NULL);
     Tcl_TraceVar2(interp, "errorInfo", NULL, TCL_GLOBAL_ONLY|TCL_TRACE_UNSETS,
@@ -632,17 +599,13 @@ EstablishErrorInfoTraces(
 
 static char *
 ErrorInfoRead(
-    ClientData dummy,
+    TCL_UNUSED(ClientData),
     Tcl_Interp *interp,
-    const char *name1,
-    const char *name2,
-    int flags)
+    TCL_UNUSED(const char *) /*name1*/,
+    TCL_UNUSED(const char *) /*name2*/,
+    TCL_UNUSED(int) /*flags*/)
 {
     Interp *iPtr = (Interp *) interp;
-    (void)dummy;
-    (void)name1;
-    (void)name2;
-    (void)flags;
 
     if (Tcl_InterpDeleted(interp) || !(iPtr->flags & ERR_LEGACY_COPY)) {
 	return NULL;
@@ -3016,7 +2979,7 @@ TclInitNamespaceCmd(
 
 static int
 NamespaceChildrenCmd(
-    ClientData dummy,		/* Not used. */
+    TCL_UNUSED(ClientData),
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
@@ -3029,7 +2992,6 @@ NamespaceChildrenCmd(
     Tcl_HashEntry *entryPtr;
     Tcl_HashSearch search;
     Tcl_Obj *listPtr, *elemPtr;
-    (void)dummy;
 
     /*
      * Get a pointer to the specified namespace, or the current namespace.
@@ -3146,7 +3108,7 @@ NamespaceChildrenCmd(
 
 static int
 NamespaceCodeCmd(
-    ClientData dummy,		/* Not used. */
+    TCL_UNUSED(ClientData),
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
@@ -3155,7 +3117,6 @@ NamespaceCodeCmd(
     Tcl_Obj *listPtr, *objPtr;
     const char *arg;
     size_t length;
-    (void)dummy;
 
     if (objc != 2) {
 	Tcl_WrongNumArgs(interp, 1, objv, "arg");
@@ -3228,13 +3189,12 @@ NamespaceCodeCmd(
 
 static int
 NamespaceCurrentCmd(
-    ClientData dummy,		/* Not used. */
+    TCL_UNUSED(ClientData),
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
     Namespace *currNsPtr;
-    (void)dummy;
 
     if (objc != 1) {
 	Tcl_WrongNumArgs(interp, 1, objv, NULL);
@@ -3292,7 +3252,7 @@ NamespaceCurrentCmd(
 
 static int
 NamespaceDeleteCmd(
-    ClientData dummy,		/* Not used. */
+    TCL_UNUSED(ClientData),
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
@@ -3300,7 +3260,6 @@ NamespaceDeleteCmd(
     Tcl_Namespace *namespacePtr;
     const char *name;
     int i;
-    (void)dummy;
 
     if (objc < 1) {
 	Tcl_WrongNumArgs(interp, 1, objv, "?name name...?");
@@ -3381,7 +3340,7 @@ NamespaceEvalCmd(
 
 static int
 NRNamespaceEvalCmd(
-    ClientData dummy,		/* Not used. */
+    TCL_UNUSED(ClientData),
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
@@ -3393,7 +3352,6 @@ NRNamespaceEvalCmd(
     CallFrame *framePtr, **framePtrPtr;
     Tcl_Obj *objPtr;
     int result;
-    (void)dummy;
 
     if (objc < 3) {
 	Tcl_WrongNumArgs(interp, 1, objv, "name arg ?arg...?");
@@ -3514,13 +3472,12 @@ NsEval_Callback(
 
 static int
 NamespaceExistsCmd(
-    ClientData dummy,		/* Not used. */
+    TCL_UNUSED(ClientData),
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
     Tcl_Namespace *namespacePtr;
-    (void)dummy;
 
     if (objc != 2) {
 	Tcl_WrongNumArgs(interp, 1, objv, "name");
@@ -3570,13 +3527,12 @@ NamespaceExistsCmd(
 
 static int
 NamespaceExportCmd(
-    ClientData dummy,		/* Not used. */
+    TCL_UNUSED(ClientData),
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
     int firstArg, i;
-    (void)dummy;
 
     if (objc < 1) {
 	Tcl_WrongNumArgs(interp, 1, objv, "?-clear? ?pattern pattern...?");
@@ -3652,14 +3608,13 @@ NamespaceExportCmd(
 
 static int
 NamespaceForgetCmd(
-    ClientData dummy,		/* Not used. */
+    TCL_UNUSED(ClientData),
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
     const char *pattern;
     int i, result;
-    (void)dummy;
 
     if (objc < 1) {
 	Tcl_WrongNumArgs(interp, 1, objv, "?pattern pattern...?");
@@ -3718,7 +3673,7 @@ NamespaceForgetCmd(
 
 static int
 NamespaceImportCmd(
-    ClientData dummy,		/* Not used. */
+    TCL_UNUSED(ClientData),
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
@@ -3727,7 +3682,6 @@ NamespaceImportCmd(
     const char *string, *pattern;
     int i, result;
     int firstArg;
-    (void)dummy;
 
     if (objc < 1) {
 	Tcl_WrongNumArgs(interp, 1, objv, "?-force? ?pattern pattern...?");
@@ -3834,7 +3788,7 @@ NamespaceInscopeCmd(
 
 static int
 NRNamespaceInscopeCmd(
-    ClientData dummy,		/* Not used. */
+    TCL_UNUSED(ClientData),
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
@@ -3843,7 +3797,6 @@ NRNamespaceInscopeCmd(
     CallFrame *framePtr, **framePtrPtr;
     int i;
     Tcl_Obj *cmdObjPtr;
-    (void)dummy;
 
     if (objc < 3) {
 	Tcl_WrongNumArgs(interp, 1, objv, "name arg ?arg...?");
@@ -3932,14 +3885,13 @@ NRNamespaceInscopeCmd(
 
 static int
 NamespaceOriginCmd(
-    ClientData dummy,		/* Not used. */
+    TCL_UNUSED(ClientData),
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
     Tcl_Command command, origCommand;
     Tcl_Obj *resultPtr;
-    (void)dummy;
 
     if (objc != 2) {
 	Tcl_WrongNumArgs(interp, 1, objv, "name");
@@ -3994,13 +3946,12 @@ NamespaceOriginCmd(
 
 static int
 NamespaceParentCmd(
-    ClientData dummy,		/* Not used. */
+    TCL_UNUSED(ClientData),
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
     Tcl_Namespace *nsPtr;
-    (void)dummy;
 
     if (objc == 1) {
 	nsPtr = TclGetCurrentNamespace(interp);
@@ -4053,7 +4004,7 @@ NamespaceParentCmd(
 
 static int
 NamespacePathCmd(
-    ClientData dummy,		/* Not used. */
+    TCL_UNUSED(ClientData),
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
@@ -4063,7 +4014,6 @@ NamespacePathCmd(
     int nsObjc, result = TCL_ERROR;
     Tcl_Obj **nsObjv;
     Tcl_Namespace **namespaceList = NULL;
-    (void)dummy;
 
     if (objc > 2) {
 	Tcl_WrongNumArgs(interp, 1, objv, "?pathList?");
@@ -4280,14 +4230,13 @@ TclInvalidateNsPath(
 
 static int
 NamespaceQualifiersCmd(
-    ClientData dummy,		/* Not used. */
+    TCL_UNUSED(ClientData),
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
     const char *name, *p;
     size_t length;
-    (void)dummy;
 
     if (objc != 2) {
 	Tcl_WrongNumArgs(interp, 1, objv, "string");
@@ -4349,7 +4298,7 @@ NamespaceQualifiersCmd(
 
 static int
 NamespaceUnknownCmd(
-    ClientData dummy,		/* Not used. */
+    TCL_UNUSED(ClientData),
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
@@ -4357,7 +4306,6 @@ NamespaceUnknownCmd(
     Tcl_Namespace *currNsPtr;
     Tcl_Obj *resultPtr;
     int rc;
-    (void)dummy;
 
     if (objc > 2) {
 	Tcl_WrongNumArgs(interp, 1, objv, "?script?");
@@ -4537,13 +4485,12 @@ Tcl_SetNamespaceUnknownHandler(
 
 static int
 NamespaceTailCmd(
-    ClientData dummy,		/* Not used. */
+    TCL_UNUSED(ClientData),
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
     const char *name, *p;
-    (void)dummy;
 
     if (objc != 2) {
 	Tcl_WrongNumArgs(interp, 1, objv, "string");
@@ -4596,7 +4543,7 @@ NamespaceTailCmd(
 
 static int
 NamespaceUpvarCmd(
-    ClientData dummy,		/* Not used. */
+    TCL_UNUSED(ClientData),
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
@@ -4605,7 +4552,6 @@ NamespaceUpvarCmd(
     Tcl_Namespace *nsPtr, *savedNsPtr;
     Var *otherPtr, *arrayPtr;
     const char *myName;
-    (void)dummy;
 
     if (objc < 2 || (objc & 1)) {
 	Tcl_WrongNumArgs(interp, 1, objv, "ns ?otherVar myVar ...?");
@@ -4671,7 +4617,7 @@ NamespaceUpvarCmd(
 
 static int
 NamespaceWhichCmd(
-    ClientData dummy,		/* Not used. */
+    TCL_UNUSED(ClientData),
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
@@ -4681,7 +4627,6 @@ NamespaceWhichCmd(
     };
     int lookupType = 0;
     Tcl_Obj *resultPtr;
-    (void)dummy;
 
     if (objc < 2 || objc > 3) {
     badArgs:
diff --git a/generic/tclOO.c b/generic/tclOO.c
index 14a3343..7c7b93c 100644
--- a/generic/tclOO.c
+++ b/generic/tclOO.c
@@ -77,13 +77,10 @@ static inline void	InitClassPath(Tcl_Interp * interp, Class *clsPtr);
 static void		InitClassSystemRoots(Tcl_Interp *interp,
 			    Foundation *fPtr);
 static int		InitFoundation(Tcl_Interp *interp);
-static void		KillFoundation(ClientData clientData,
-			    Tcl_Interp *interp);
+static Tcl_InterpDeleteProc	KillFoundation;
 static void		MyDeleted(ClientData clientData);
 static void		ObjectNamespaceDeleted(ClientData clientData);
-static void		ObjectRenamedTrace(ClientData clientData,
-			    Tcl_Interp *interp, const char *oldName,
-			    const char *newName, int flags);
+static Tcl_CommandTraceProc	ObjectRenamedTrace;
 static inline void	RemoveClass(Class **list, int num, int idx);
 static inline void	RemoveObject(Object **list, int num, int idx);
 static inline void	SquelchCachedName(Object *oPtr);
@@ -569,13 +566,11 @@ DeletedHelpersNamespace(
 
 static void
 KillFoundation(
-    ClientData dummy,	/* Pointer to the OO system foundation
-				 * structure. */
-    Tcl_Interp *interp)		/* The interpreter containing the OO system
-				 * foundation. */
+    TCL_UNUSED(ClientData),
+    Tcl_Interp *interp)	/* The interpreter containing the OO system
+			 * foundation. */
 {
     Foundation *fPtr = GetFoundation(interp);
-    (void)dummy;
 
     TclDecrRefCount(fPtr->unknownMethodNameObj);
     TclDecrRefCount(fPtr->constructorName);
@@ -819,15 +814,12 @@ MyClassDeleted(
 static void
 ObjectRenamedTrace(
     ClientData clientData,	/* The object being deleted. */
-    Tcl_Interp *interp,		/* The interpreter containing the object. */
-    const char *oldName,	/* What the object was (last) called. */
-    const char *newName,	/* What it's getting renamed to. (unused) */
+    TCL_UNUSED(Tcl_Interp *),
+    TCL_UNUSED(const char *) /*oldName*/,
+    TCL_UNUSED(const char *) /*newName*/,
     int flags)			/* Why was the object deleted? */
 {
     Object *oPtr = (Object *)clientData;
-    (void)interp;
-    (void)oldName;
-    (void)newName;
 
     /*
      * If this is a rename and not a delete of the object, we just flush the
@@ -2765,10 +2757,9 @@ TclOOObjectCmdCore(
 static int
 FinalizeObjectCall(
     ClientData data[],
-    Tcl_Interp *dummy,
+    TCL_UNUSED(Tcl_Interp *),
     int result)
 {
-    (void)dummy;
     /*
      * Dispose of the call chain, which drops the lock on the object's
      * structure.
@@ -2927,11 +2918,10 @@ TclNRObjectContextInvokeNext(
 static int
 FinalizeNext(
     ClientData data[],
-    Tcl_Interp *dummy,
+    TCL_UNUSED(Tcl_Interp *),
     int result)
 {
     CallContext *contextPtr = (CallContext *)data[0];
-    (void)dummy;
 
     /*
      * Restore the call chain context index as we've finished the inner invoke
diff --git a/generic/tclOOBasic.c b/generic/tclOOBasic.c
index c823f7a..66d6002 100644
--- a/generic/tclOOBasic.c
+++ b/generic/tclOOBasic.c
@@ -76,7 +76,7 @@ FinalizeConstruction(
 
 int
 TclOO_Class_Constructor(
-    ClientData dummy,
+    TCL_UNUSED(ClientData),
     Tcl_Interp *interp,
     Tcl_ObjectContext context,
     int objc,
@@ -84,7 +84,6 @@ TclOO_Class_Constructor(
 {
     Object *oPtr = (Object *) Tcl_ObjectContextObject(context);
     Tcl_Obj **invoke, *nameObj;
-    (void)dummy;
 
     if (objc-1 > Tcl_ObjectContextSkippedArgs(context)) {
 	Tcl_WrongNumArgs(interp, Tcl_ObjectContextSkippedArgs(context), objv,
@@ -175,7 +174,7 @@ DecrRefsPostClassConstructor(
 
 int
 TclOO_Class_Create(
-    ClientData dummy,	/* Ignored. */
+    TCL_UNUSED(ClientData),
     Tcl_Interp *interp,		/* Interpreter in which to create the object;
 				 * also used for error reporting. */
     Tcl_ObjectContext context,	/* The object/call context. */
@@ -185,7 +184,6 @@ TclOO_Class_Create(
     Object *oPtr = (Object *) Tcl_ObjectContextObject(context);
     const char *objName;
     size_t len;
-    (void)dummy;
 
     /*
      * Sanity check; should not be possible to invoke this method on a
@@ -241,7 +239,7 @@ TclOO_Class_Create(
 
 int
 TclOO_Class_CreateNs(
-    ClientData dummy,	/* Ignored. */
+    TCL_UNUSED(ClientData),
     Tcl_Interp *interp,		/* Interpreter in which to create the object;
 				 * also used for error reporting. */
     Tcl_ObjectContext context,	/* The object/call context. */
@@ -251,7 +249,6 @@ TclOO_Class_CreateNs(
     Object *oPtr = (Object *) Tcl_ObjectContextObject(context);
     const char *objName, *nsName;
     size_t len;
-    (void)dummy;
 
     /*
      * Sanity check; should not be possible to invoke this method on a
@@ -315,7 +312,7 @@ TclOO_Class_CreateNs(
 
 int
 TclOO_Class_New(
-    ClientData dummy,	/* Ignored. */
+    TCL_UNUSED(ClientData),
     Tcl_Interp *interp,		/* Interpreter in which to create the object;
 				 * also used for error reporting. */
     Tcl_ObjectContext context,	/* The object/call context. */
@@ -323,7 +320,6 @@ TclOO_Class_New(
     Tcl_Obj *const *objv)	/* The actual arguments. */
 {
     Object *oPtr = (Object *) Tcl_ObjectContextObject(context);
-    (void)dummy;
 
     /*
      * Sanity check; should not be possible to invoke this method on a
@@ -360,7 +356,7 @@ TclOO_Class_New(
 
 int
 TclOO_Object_Destroy(
-    ClientData dummy,	/* Ignored. */
+    TCL_UNUSED(ClientData),
     Tcl_Interp *interp,		/* Interpreter in which to create the object;
 				 * also used for error reporting. */
     Tcl_ObjectContext context,	/* The object/call context. */
@@ -369,7 +365,6 @@ TclOO_Object_Destroy(
 {
     Object *oPtr = (Object *) Tcl_ObjectContextObject(context);
     CallContext *contextPtr;
-    (void)dummy;
 
     if (objc != Tcl_ObjectContextSkippedArgs(context)) {
 	Tcl_WrongNumArgs(interp, Tcl_ObjectContextSkippedArgs(context), objv,
@@ -422,7 +417,7 @@ AfterNRDestructor(
 
 int
 TclOO_Object_Eval(
-    ClientData dummy,	/* Ignored. */
+    TCL_UNUSED(ClientData),
     Tcl_Interp *interp,		/* Interpreter in which to create the object;
 				 * also used for error reporting. */
     Tcl_ObjectContext context,	/* The object/call context. */
@@ -435,7 +430,6 @@ TclOO_Object_Eval(
     CallFrame *framePtr, **framePtrPtr = &framePtr;
     Tcl_Obj *scriptPtr;
     CmdFrame *invoker;
-    (void)dummy;
 
     if (objc-1 < skip) {
 	Tcl_WrongNumArgs(interp, skip, objv, "arg ?arg ...?");
@@ -524,7 +518,7 @@ FinalizeEval(
 
 int
 TclOO_Object_Unknown(
-    ClientData dummy,	/* Ignored. */
+    TCL_UNUSED(ClientData),
     Tcl_Interp *interp,		/* Interpreter in which to create the object;
 				 * also used for error reporting. */
     Tcl_ObjectContext context,	/* The object/call context. */
@@ -539,7 +533,6 @@ TclOO_Object_Unknown(
     int numMethodNames, i, skip = Tcl_ObjectContextSkippedArgs(context);
     CallFrame *framePtr = ((Interp *) interp)->varFramePtr;
     Tcl_Obj *errorMsg;
-    (void)dummy;
 
     /*
      * If no method name, generate an error asking for a method name. (Only by
@@ -631,7 +624,7 @@ TclOO_Object_Unknown(
 
 int
 TclOO_Object_LinkVar(
-    ClientData dummy,	/* Ignored. */
+    TCL_UNUSED(ClientData),
     Tcl_Interp *interp,		/* Interpreter in which to create the object;
 				 * also used for error reporting. */
     Tcl_ObjectContext context,	/* The object/call context. */
@@ -642,7 +635,6 @@ TclOO_Object_LinkVar(
     Tcl_Object object = Tcl_ObjectContextObject(context);
     Namespace *savedNsPtr;
     int i;
-    (void)dummy;
 
     if (objc-Tcl_ObjectContextSkippedArgs(context) < 0) {
 	Tcl_WrongNumArgs(interp, Tcl_ObjectContextSkippedArgs(context), objv,
@@ -734,7 +726,7 @@ TclOO_Object_LinkVar(
 
 int
 TclOO_Object_VarName(
-    ClientData dummy,	/* Ignored. */
+    TCL_UNUSED(ClientData),
     Tcl_Interp *interp,		/* Interpreter in which to create the object;
 				 * also used for error reporting. */
     Tcl_ObjectContext context,	/* The object/call context. */
@@ -745,7 +737,6 @@ TclOO_Object_VarName(
     Tcl_Obj *varNamePtr, *argPtr;
     CallFrame *framePtr = ((Interp *) interp)->varFramePtr;
     const char *arg;
-    (void)dummy;
 
     if (Tcl_ObjectContextSkippedArgs(context)+1 != objc) {
 	Tcl_WrongNumArgs(interp, Tcl_ObjectContextSkippedArgs(context), objv,
@@ -873,7 +864,7 @@ TclOO_Object_VarName(
 
 int
 TclOONextObjCmd(
-    ClientData dummy,
+    TCL_UNUSED(ClientData),
     Tcl_Interp *interp,
     int objc,
     Tcl_Obj *const *objv)
@@ -881,7 +872,6 @@ TclOONextObjCmd(
     Interp *iPtr = (Interp *) interp;
     CallFrame *framePtr = iPtr->varFramePtr;
     Tcl_ObjectContext context;
-    (void)dummy;
 
     /*
      * Start with sanity checks on the calling context to make sure that we
@@ -910,7 +900,7 @@ TclOONextObjCmd(
 
 int
 TclOONextToObjCmd(
-    ClientData dummy,
+    TCL_UNUSED(ClientData),
     Tcl_Interp *interp,
     int objc,
     Tcl_Obj *const *objv)
@@ -922,7 +912,6 @@ TclOONextToObjCmd(
     int i;
     Tcl_Object object;
     const char *methodType;
-    (void)dummy;
 
     /*
      * Start with sanity checks on the calling context to make sure that we
@@ -1044,7 +1033,7 @@ NextRestoreFrame(
 
 int
 TclOOSelfObjCmd(
-    ClientData dummy,
+    TCL_UNUSED(ClientData),
     Tcl_Interp *interp,
     int objc,
     Tcl_Obj *const *objv)
@@ -1062,7 +1051,6 @@ TclOOSelfObjCmd(
     CallContext *contextPtr;
     Tcl_Obj *result[3];
     int index;
-    (void)dummy;
 
 #define CurrentlyInvoked(contextPtr) \
     ((contextPtr)->callPtr->chain[(contextPtr)->index])
@@ -1282,13 +1270,12 @@ TclOOSelfObjCmd(
 
 int
 TclOOCopyObjectCmd(
-    ClientData dummy,
+    TCL_UNUSED(ClientData),
     Tcl_Interp *interp,
     int objc,
     Tcl_Obj *const *objv)
 {
     Tcl_Object oPtr, o2Ptr;
-    (void)dummy;
 
     if (objc < 2 || objc > 4) {
 	Tcl_WrongNumArgs(interp, 1, objv,
diff --git a/generic/tclOOCall.c b/generic/tclOOCall.c
index 03b7be0..5498883 100644
--- a/generic/tclOOCall.c
+++ b/generic/tclOOCall.c
@@ -376,11 +376,10 @@ TclOOInvokeContext(
 static int
 SetFilterFlags(
     ClientData data[],
-    Tcl_Interp *dummy,
+    TCL_UNUSED(Tcl_Interp *),
     int result)
 {
     CallContext *contextPtr = (CallContext *)data[0];
-    (void)dummy;
 
     contextPtr->oPtr->flags |= FILTER_HANDLING;
     return result;
@@ -389,11 +388,10 @@ SetFilterFlags(
 static int
 ResetFilterFlags(
     ClientData data[],
-    Tcl_Interp *dummy,
+    TCL_UNUSED(Tcl_Interp *),
     int result)
 {
     CallContext *contextPtr = (CallContext *)data[0];
-    (void)dummy;
 
     contextPtr->oPtr->flags &= ~FILTER_HANDLING;
     return result;
@@ -402,12 +400,11 @@ ResetFilterFlags(
 static int
 FinalizeMethodRefs(
     ClientData data[],
-    Tcl_Interp *dummy,
+    TCL_UNUSED(Tcl_Interp *),
     int result)
 {
     CallContext *contextPtr = (CallContext *)data[0];
     int i;
-    (void)dummy;
 
     for (i = 0 ; i < contextPtr->callPtr->numChain ; i++) {
 	TclOODelMethodRef(contextPtr->callPtr->chain[i].mPtr);
diff --git a/generic/tclOODefineCmds.c b/generic/tclOODefineCmds.c
index c2fa243..b221191 100644
--- a/generic/tclOODefineCmds.c
+++ b/generic/tclOODefineCmds.c
@@ -695,7 +695,7 @@ RenameDeleteMethod(
 
 int
 TclOOUnknownDefinition(
-    ClientData dummy,
+    TCL_UNUSED(ClientData),
     Tcl_Interp *interp,
     int objc,
     Tcl_Obj *const *objv)
@@ -705,7 +705,6 @@ TclOOUnknownDefinition(
     Tcl_HashEntry *hPtr;
     size_t soughtLen;
     const char *soughtStr, *matchedStr = NULL;
-    (void)dummy;
 
     if (objc < 2) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
@@ -1093,7 +1092,7 @@ MagicDefinitionInvoke(
 
 int
 TclOODefineObjCmd(
-    ClientData dummy,
+    TCL_UNUSED(ClientData),
     Tcl_Interp *interp,
     int objc,
     Tcl_Obj *const *objv)
@@ -1101,7 +1100,6 @@ TclOODefineObjCmd(
     Tcl_Namespace *nsPtr;
     Object *oPtr;
     int result;
-    (void)dummy;
 
     if (objc < 3) {
 	Tcl_WrongNumArgs(interp, 1, objv, "className arg ?arg ...?");
@@ -1170,7 +1168,7 @@ TclOODefineObjCmd(
 
 int
 TclOOObjDefObjCmd(
-    ClientData dummy,
+    TCL_UNUSED(ClientData),
     Tcl_Interp *interp,
     int objc,
     Tcl_Obj *const *objv)
@@ -1178,7 +1176,6 @@ TclOOObjDefObjCmd(
     Tcl_Namespace *nsPtr;
     Object *oPtr;
     int result;
-    (void)dummy;
 
     if (objc < 3) {
 	Tcl_WrongNumArgs(interp, 1, objv, "objectName arg ?arg ...?");
@@ -1240,7 +1237,7 @@ TclOOObjDefObjCmd(
 
 int
 TclOODefineSelfObjCmd(
-    ClientData dummy,
+    TCL_UNUSED(ClientData),
     Tcl_Interp *interp,
     int objc,
     Tcl_Obj *const *objv)
@@ -1248,7 +1245,6 @@ TclOODefineSelfObjCmd(
     Tcl_Namespace *nsPtr;
     Object *oPtr;
     int result, isPrivate;
-    (void)dummy;
 
     oPtr = (Object *) TclOOGetDefineCmdContext(interp);
     if (oPtr == NULL) {
@@ -1312,13 +1308,12 @@ TclOODefineSelfObjCmd(
 
 int
 TclOODefineObjSelfObjCmd(
-    ClientData dummy,
+    TCL_UNUSED(ClientData),
     Tcl_Interp *interp,
     int objc,
     Tcl_Obj *const *objv)
 {
     Object *oPtr;
-    (void)dummy;
 
     if (objc != 1) {
 	Tcl_WrongNumArgs(interp, 1, objv, NULL);
@@ -1420,7 +1415,7 @@ TclOODefinePrivateObjCmd(
 
 int
 TclOODefineClassObjCmd(
-    ClientData dummy,
+    TCL_UNUSED(ClientData),
     Tcl_Interp *interp,
     int objc,
     Tcl_Obj *const *objv)
@@ -1429,7 +1424,6 @@ TclOODefineClassObjCmd(
     Class *clsPtr;
     Foundation *fPtr = TclOOGetFoundation(interp);
     int wasClass, willBeClass;
-    (void)dummy;
 
     /*
      * Parse the context to get the object to operate on.
@@ -1530,7 +1524,7 @@ TclOODefineClassObjCmd(
 
 int
 TclOODefineConstructorObjCmd(
-    ClientData dummy,
+    TCL_UNUSED(ClientData),
     Tcl_Interp *interp,
     int objc,
     Tcl_Obj *const *objv)
@@ -1539,7 +1533,6 @@ TclOODefineConstructorObjCmd(
     Class *clsPtr;
     Tcl_Method method;
     size_t bodyLength;
-    (void)dummy;
 
     if (objc != 3) {
 	Tcl_WrongNumArgs(interp, 1, objv, "arguments body");
@@ -1600,7 +1593,7 @@ TclOODefineConstructorObjCmd(
 
 int
 TclOODefineDefnNsObjCmd(
-    ClientData dummy,
+    TCL_UNUSED(ClientData),
     Tcl_Interp *interp,
     int objc,
     Tcl_Obj *const *objv)
@@ -1614,7 +1607,6 @@ TclOODefineDefnNsObjCmd(
     Object *oPtr;
     Tcl_Namespace *nsPtr;
     Tcl_Obj *nsNamePtr, **storagePtr;
-    (void)dummy;
 
     oPtr = (Object *) TclOOGetDefineCmdContext(interp);
     if (oPtr == NULL) {
@@ -1743,7 +1735,7 @@ TclOODefineDeleteMethodObjCmd(
 
 int
 TclOODefineDestructorObjCmd(
-    ClientData dummy,
+    TCL_UNUSED(ClientData),
     Tcl_Interp *interp,
     int objc,
     Tcl_Obj *const *objv)
@@ -1752,7 +1744,6 @@ TclOODefineDestructorObjCmd(
     Class *clsPtr;
     Tcl_Method method;
     size_t bodyLength;
-    (void)dummy;
 
     if (objc != 2) {
 	Tcl_WrongNumArgs(interp, 1, objv, "body");
@@ -2323,7 +2314,7 @@ TclOODefineSlots(
 
 static int
 ClassFilterGet(
-    ClientData dummy,
+    TCL_UNUSED(ClientData),
     Tcl_Interp *interp,
     Tcl_ObjectContext context,
     int objc,
@@ -2332,7 +2323,6 @@ ClassFilterGet(
     Object *oPtr = (Object *) TclOOGetDefineCmdContext(interp);
     Tcl_Obj *resultObj, *filterObj;
     int i;
-    (void)dummy;
 
     if (Tcl_ObjectContextSkippedArgs(context) != objc) {
 	Tcl_WrongNumArgs(interp, Tcl_ObjectContextSkippedArgs(context), objv,
@@ -2358,7 +2348,7 @@ ClassFilterGet(
 
 static int
 ClassFilterSet(
-    ClientData dummy,
+    TCL_UNUSED(ClientData),
     Tcl_Interp *interp,
     Tcl_ObjectContext context,
     int objc,
@@ -2367,7 +2357,6 @@ ClassFilterSet(
     Object *oPtr = (Object *) TclOOGetDefineCmdContext(interp);
     int filterc;
     Tcl_Obj **filterv;
-    (void)dummy;
 
     if (Tcl_ObjectContextSkippedArgs(context) + 1 != objc) {
 	Tcl_WrongNumArgs(interp, Tcl_ObjectContextSkippedArgs(context), objv,
@@ -2405,7 +2394,7 @@ ClassFilterSet(
 
 static int
 ClassMixinGet(
-    ClientData dummy,
+    TCL_UNUSED(ClientData),
     Tcl_Interp *interp,
     Tcl_ObjectContext context,
     int objc,
@@ -2415,7 +2404,6 @@ ClassMixinGet(
     Tcl_Obj *resultObj;
     Class *mixinPtr;
     int i;
-    (void)dummy;
 
     if (Tcl_ObjectContextSkippedArgs(context) != objc) {
 	Tcl_WrongNumArgs(interp, Tcl_ObjectContextSkippedArgs(context), objv,
@@ -2443,7 +2431,7 @@ ClassMixinGet(
 
 static int
 ClassMixinSet(
-    ClientData dummy,
+    TCL_UNUSED(ClientData),
     Tcl_Interp *interp,
     Tcl_ObjectContext context,
     int objc,
@@ -2453,7 +2441,6 @@ ClassMixinSet(
     int mixinc, i;
     Tcl_Obj **mixinv;
     Class **mixins;
-    (void)dummy;
 
     if (Tcl_ObjectContextSkippedArgs(context) + 1 != objc) {
 	Tcl_WrongNumArgs(interp, Tcl_ObjectContextSkippedArgs(context), objv,
@@ -2513,7 +2500,7 @@ ClassMixinSet(
 
 static int
 ClassSuperGet(
-    ClientData dummy,
+    TCL_UNUSED(ClientData),
     Tcl_Interp *interp,
     Tcl_ObjectContext context,
     int objc,
@@ -2523,7 +2510,6 @@ ClassSuperGet(
     Tcl_Obj *resultObj;
     Class *superPtr;
     int i;
-    (void)dummy;
 
     if (Tcl_ObjectContextSkippedArgs(context) != objc) {
 	Tcl_WrongNumArgs(interp, Tcl_ObjectContextSkippedArgs(context), objv,
@@ -2550,7 +2536,7 @@ ClassSuperGet(
 
 static int
 ClassSuperSet(
-    ClientData dummy,
+    TCL_UNUSED(ClientData),
     Tcl_Interp *interp,
     Tcl_ObjectContext context,
     int objc,
@@ -2560,7 +2546,6 @@ ClassSuperSet(
     int superc, i, j;
     Tcl_Obj **superv;
     Class **superclasses, *superPtr;
-    (void)dummy;
 
     if (Tcl_ObjectContextSkippedArgs(context) + 1 != objc) {
 	Tcl_WrongNumArgs(interp, Tcl_ObjectContextSkippedArgs(context), objv,
@@ -2682,7 +2667,7 @@ ClassSuperSet(
 
 static int
 ClassVarsGet(
-    ClientData dummy,
+    TCL_UNUSED(ClientData),
     Tcl_Interp *interp,
     Tcl_ObjectContext context,
     int objc,
@@ -2691,7 +2676,6 @@ ClassVarsGet(
     Object *oPtr = (Object *) TclOOGetDefineCmdContext(interp);
     Tcl_Obj *resultObj;
     int i;
-    (void)dummy;
 
     if (Tcl_ObjectContextSkippedArgs(context) != objc) {
 	Tcl_WrongNumArgs(interp, Tcl_ObjectContextSkippedArgs(context), objv,
@@ -2727,7 +2711,7 @@ ClassVarsGet(
 
 static int
 ClassVarsSet(
-    ClientData dummy,
+    TCL_UNUSED(ClientData),
     Tcl_Interp *interp,
     Tcl_ObjectContext context,
     int objc,
@@ -2737,7 +2721,6 @@ ClassVarsSet(
     int varc;
     Tcl_Obj **varv;
     int i;
-    (void)dummy;
 
     if (Tcl_ObjectContextSkippedArgs(context) + 1 != objc) {
 	Tcl_WrongNumArgs(interp, Tcl_ObjectContextSkippedArgs(context), objv,
@@ -2799,7 +2782,7 @@ ClassVarsSet(
 
 static int
 ObjFilterGet(
-    ClientData dummy,
+    TCL_UNUSED(ClientData),
     Tcl_Interp *interp,
     Tcl_ObjectContext context,
     int objc,
@@ -2808,7 +2791,6 @@ ObjFilterGet(
     Object *oPtr = (Object *) TclOOGetDefineCmdContext(interp);
     Tcl_Obj *resultObj, *filterObj;
     int i;
-    (void)dummy;
 
     if (Tcl_ObjectContextSkippedArgs(context) != objc) {
 	Tcl_WrongNumArgs(interp, Tcl_ObjectContextSkippedArgs(context), objv,
@@ -2828,7 +2810,7 @@ ObjFilterGet(
 
 static int
 ObjFilterSet(
-    ClientData dummy,
+    TCL_UNUSED(ClientData),
     Tcl_Interp *interp,
     Tcl_ObjectContext context,
     int objc,
@@ -2837,7 +2819,6 @@ ObjFilterSet(
     Object *oPtr = (Object *) TclOOGetDefineCmdContext(interp);
     int filterc;
     Tcl_Obj **filterv;
-    (void)dummy;
 
     if (Tcl_ObjectContextSkippedArgs(context) + 1 != objc) {
 	Tcl_WrongNumArgs(interp, Tcl_ObjectContextSkippedArgs(context), objv,
@@ -2869,7 +2850,7 @@ ObjFilterSet(
 
 static int
 ObjMixinGet(
-    ClientData dummy,
+    TCL_UNUSED(ClientData),
     Tcl_Interp *interp,
     Tcl_ObjectContext context,
     int objc,
@@ -2879,7 +2860,6 @@ ObjMixinGet(
     Tcl_Obj *resultObj;
     Class *mixinPtr;
     int i;
-    (void)dummy;
 
     if (Tcl_ObjectContextSkippedArgs(context) != objc) {
 	Tcl_WrongNumArgs(interp, Tcl_ObjectContextSkippedArgs(context), objv,
@@ -2902,7 +2882,7 @@ ObjMixinGet(
 
 static int
 ObjMixinSet(
-    ClientData dummy,
+    TCL_UNUSED(ClientData),
     Tcl_Interp *interp,
     Tcl_ObjectContext context,
     int objc,
@@ -2913,7 +2893,6 @@ ObjMixinSet(
     Tcl_Obj **mixinv;
     Class **mixins;
     int i;
-    (void)dummy;
 
     if (Tcl_ObjectContextSkippedArgs(context) + 1 != objc) {
 	Tcl_WrongNumArgs(interp, Tcl_ObjectContextSkippedArgs(context), objv,
@@ -2957,7 +2936,7 @@ ObjMixinSet(
 
 static int
 ObjVarsGet(
-    ClientData dummy,
+    TCL_UNUSED(ClientData),
     Tcl_Interp *interp,
     Tcl_ObjectContext context,
     int objc,
@@ -2966,7 +2945,6 @@ ObjVarsGet(
     Object *oPtr = (Object *) TclOOGetDefineCmdContext(interp);
     Tcl_Obj *resultObj;
     int i;
-    (void)dummy;
 
     if (Tcl_ObjectContextSkippedArgs(context) != objc) {
 	Tcl_WrongNumArgs(interp, Tcl_ObjectContextSkippedArgs(context), objv,
@@ -2996,7 +2974,7 @@ ObjVarsGet(
 
 static int
 ObjVarsSet(
-    ClientData dummy,
+    TCL_UNUSED(ClientData),
     Tcl_Interp *interp,
     Tcl_ObjectContext context,
     int objc,
@@ -3005,7 +2983,6 @@ ObjVarsSet(
     Object *oPtr = (Object *) TclOOGetDefineCmdContext(interp);
     int varc, i;
     Tcl_Obj **varv;
-    (void)dummy;
 
     if (Tcl_ObjectContextSkippedArgs(context) + 1 != objc) {
 	Tcl_WrongNumArgs(interp, Tcl_ObjectContextSkippedArgs(context), objv,
@@ -3062,7 +3039,7 @@ ObjVarsSet(
 
 static int
 ResolveClass(
-    ClientData dummy,
+    TCL_UNUSED(ClientData),
     Tcl_Interp *interp,
     Tcl_ObjectContext context,
     int objc,
@@ -3071,7 +3048,6 @@ ResolveClass(
     int idx = Tcl_ObjectContextSkippedArgs(context);
     Object *oPtr = (Object *) TclOOGetDefineCmdContext(interp);
     Class *clsPtr;
-    (void)dummy;
 
     /*
      * Check if were called wrongly. The definition context isn't used...
diff --git a/generic/tclOOInfo.c b/generic/tclOOInfo.c
index 7d53fbd..3a3b8c4 100644
--- a/generic/tclOOInfo.c
+++ b/generic/tclOOInfo.c
@@ -171,13 +171,12 @@ GetClassFromObj(
 
 static int
 InfoObjectClassCmd(
-    ClientData dummy,
+    TCL_UNUSED(ClientData),
     Tcl_Interp *interp,
     int objc,
     Tcl_Obj *const objv[])
 {
     Object *oPtr;
-    (void)dummy;
 
     if (objc != 2 && objc != 3) {
 	Tcl_WrongNumArgs(interp, 1, objv, "objName ?className?");
@@ -229,7 +228,7 @@ InfoObjectClassCmd(
 
 static int
 InfoObjectDefnCmd(
-    ClientData dummy,
+    TCL_UNUSED(ClientData),
     Tcl_Interp *interp,
     int objc,
     Tcl_Obj *const objv[])
@@ -239,7 +238,6 @@ InfoObjectDefnCmd(
     Proc *procPtr;
     CompiledLocal *localPtr;
     Tcl_Obj *resultObjs[2];
-    (void)dummy;
 
     if (objc != 3) {
 	Tcl_WrongNumArgs(interp, 1, objv, "objName methodName");
@@ -304,7 +302,7 @@ InfoObjectDefnCmd(
 
 static int
 InfoObjectFiltersCmd(
-    ClientData dummy,
+    TCL_UNUSED(ClientData),
     Tcl_Interp *interp,
     int objc,
     Tcl_Obj *const objv[])
@@ -312,7 +310,6 @@ InfoObjectFiltersCmd(
     int i;
     Tcl_Obj *filterObj, *resultObj;
     Object *oPtr;
-    (void)dummy;
 
     if (objc != 2) {
 	Tcl_WrongNumArgs(interp, 1, objv, "objName");
@@ -344,7 +341,7 @@ InfoObjectFiltersCmd(
 
 static int
 InfoObjectForwardCmd(
-    ClientData dummy,
+    TCL_UNUSED(ClientData),
     Tcl_Interp *interp,
     int objc,
     Tcl_Obj *const objv[])
@@ -352,7 +349,6 @@ InfoObjectForwardCmd(
     Object *oPtr;
     Tcl_HashEntry *hPtr;
     Tcl_Obj *prefixObj;
-    (void)dummy;
 
     if (objc != 3) {
 	Tcl_WrongNumArgs(interp, 1, objv, "objName methodName");
@@ -402,7 +398,7 @@ InfoObjectForwardCmd(
 
 static int
 InfoObjectIsACmd(
-    ClientData dummy,
+    TCL_UNUSED(ClientData),
     Tcl_Interp *interp,
     int objc,
     Tcl_Obj *const objv[])
@@ -415,7 +411,6 @@ InfoObjectIsACmd(
     };
     Object *oPtr, *o2Ptr;
     int idx, i, result = 0;
-    (void)dummy;
 
     if (objc < 3) {
 	Tcl_WrongNumArgs(interp, 1, objv, "category objName ?arg ...?");
@@ -522,7 +517,7 @@ InfoObjectIsACmd(
 
 static int
 InfoObjectMethodsCmd(
-    ClientData dummy,
+    TCL_UNUSED(ClientData),
     Tcl_Interp *interp,
     int objc,
     Tcl_Obj *const objv[])
@@ -545,7 +540,6 @@ InfoObjectMethodsCmd(
 	SCOPE_PRIVATE, SCOPE_PUBLIC, SCOPE_UNEXPORTED,
 	SCOPE_LOCALPRIVATE
     };
-    (void)dummy;
 
     if (objc < 2) {
 	Tcl_WrongNumArgs(interp, 1, objv, "objName ?-option value ...?");
@@ -643,7 +637,7 @@ InfoObjectMethodsCmd(
 
 static int
 InfoObjectMethodTypeCmd(
-    ClientData dummy,
+    TCL_UNUSED(ClientData),
     Tcl_Interp *interp,
     int objc,
     Tcl_Obj *const objv[])
@@ -651,7 +645,6 @@ InfoObjectMethodTypeCmd(
     Object *oPtr;
     Tcl_HashEntry *hPtr;
     Method *mPtr;
-    (void)dummy;
 
     if (objc != 3) {
 	Tcl_WrongNumArgs(interp, 1, objv, "objName methodName");
@@ -701,7 +694,7 @@ InfoObjectMethodTypeCmd(
 
 static int
 InfoObjectMixinsCmd(
-    ClientData dummy,
+    TCL_UNUSED(ClientData),
     Tcl_Interp *interp,
     int objc,
     Tcl_Obj *const objv[])
@@ -710,7 +703,6 @@ InfoObjectMixinsCmd(
     Object *oPtr;
     Tcl_Obj *resultObj;
     int i;
-    (void)dummy;
 
     if (objc != 2) {
 	Tcl_WrongNumArgs(interp, 1, objv, "objName");
@@ -745,13 +737,12 @@ InfoObjectMixinsCmd(
 
 static int
 InfoObjectIdCmd(
-    ClientData dummy,
+    TCL_UNUSED(ClientData),
     Tcl_Interp *interp,
     int objc,
     Tcl_Obj *const objv[])
 {
     Object *oPtr;
-    (void)dummy;
 
     if (objc != 2) {
 	Tcl_WrongNumArgs(interp, 1, objv, "objName");
@@ -778,13 +769,12 @@ InfoObjectIdCmd(
 
 static int
 InfoObjectNsCmd(
-    ClientData dummy,
+    TCL_UNUSED(ClientData),
     Tcl_Interp *interp,
     int objc,
     Tcl_Obj *const objv[])
 {
     Object *oPtr;
-    (void)dummy;
 
     if (objc != 2) {
 	Tcl_WrongNumArgs(interp, 1, objv, "objName");
@@ -812,7 +802,7 @@ InfoObjectNsCmd(
 
 static int
 InfoObjectVariablesCmd(
-    ClientData dummy,
+    TCL_UNUSED(ClientData),
     Tcl_Interp *interp,
     int objc,
     Tcl_Obj *const objv[])
@@ -820,7 +810,6 @@ InfoObjectVariablesCmd(
     Object *oPtr;
     Tcl_Obj *resultObj;
     int i, isPrivate = 0;
-    (void)dummy;
 
     if (objc != 2 && objc != 3) {
 	Tcl_WrongNumArgs(interp, 1, objv, "objName ?-private?");
@@ -867,7 +856,7 @@ InfoObjectVariablesCmd(
 
 static int
 InfoObjectVarsCmd(
-    ClientData dummy,
+    TCL_UNUSED(ClientData),
     Tcl_Interp *interp,
     int objc,
     Tcl_Obj *const objv[])
@@ -877,7 +866,6 @@ InfoObjectVarsCmd(
     FOREACH_HASH_DECLS;
     VarInHash *vihPtr;
     Tcl_Obj *nameObj, *resultObj;
-    (void)dummy;
 
     if (objc != 2 && objc != 3) {
 	Tcl_WrongNumArgs(interp, 1, objv, "objName ?pattern?");
@@ -929,7 +917,7 @@ InfoObjectVarsCmd(
 
 static int
 InfoClassConstrCmd(
-    ClientData dummy,
+    TCL_UNUSED(ClientData),
     Tcl_Interp *interp,
     int objc,
     Tcl_Obj *const objv[])
@@ -938,7 +926,6 @@ InfoClassConstrCmd(
     CompiledLocal *localPtr;
     Tcl_Obj *resultObjs[2];
     Class *clsPtr;
-    (void)dummy;
 
     if (objc != 2) {
 	Tcl_WrongNumArgs(interp, 1, objv, "className");
@@ -991,7 +978,7 @@ InfoClassConstrCmd(
 
 static int
 InfoClassDefnCmd(
-    ClientData dummy,
+    TCL_UNUSED(ClientData),
     Tcl_Interp *interp,
     int objc,
     Tcl_Obj *const objv[])
@@ -1001,7 +988,6 @@ InfoClassDefnCmd(
     CompiledLocal *localPtr;
     Tcl_Obj *resultObjs[2];
     Class *clsPtr;
-    (void)dummy;
 
     if (objc != 3) {
 	Tcl_WrongNumArgs(interp, 1, objv, "className methodName");
@@ -1060,7 +1046,7 @@ InfoClassDefnCmd(
 
 static int
 InfoClassDefnNsCmd(
-    ClientData dummy,
+    TCL_UNUSED(ClientData),
     Tcl_Interp *interp,
     int objc,
     Tcl_Obj *const objv[])
@@ -1073,7 +1059,6 @@ InfoClassDefnNsCmd(
     int kind = 0;
     Tcl_Obj *nsNamePtr;
     Class *clsPtr;
-    (void)dummy;
 
     if (objc != 2 && objc != 3) {
 	Tcl_WrongNumArgs(interp, 1, objv, "className ?kind?");
@@ -1111,14 +1096,13 @@ InfoClassDefnNsCmd(
 
 static int
 InfoClassDestrCmd(
-    ClientData dummy,
+    TCL_UNUSED(ClientData),
     Tcl_Interp *interp,
     int objc,
     Tcl_Obj *const objv[])
 {
     Proc *procPtr;
     Class *clsPtr;
-    (void)dummy;
 
     if (objc != 2) {
 	Tcl_WrongNumArgs(interp, 1, objv, "className");
@@ -1156,7 +1140,7 @@ InfoClassDestrCmd(
 
 static int
 InfoClassFiltersCmd(
-    ClientData dummy,
+    TCL_UNUSED(ClientData),
     Tcl_Interp *interp,
     int objc,
     Tcl_Obj *const objv[])
@@ -1164,7 +1148,6 @@ InfoClassFiltersCmd(
     int i;
     Tcl_Obj *filterObj, *resultObj;
     Class *clsPtr;
-    (void)dummy;
 
     if (objc != 2) {
 	Tcl_WrongNumArgs(interp, 1, objv, "className");
@@ -1195,7 +1178,7 @@ InfoClassFiltersCmd(
 
 static int
 InfoClassForwardCmd(
-    ClientData dummy,
+    TCL_UNUSED(ClientData),
     Tcl_Interp *interp,
     int objc,
     Tcl_Obj *const objv[])
@@ -1203,7 +1186,6 @@ InfoClassForwardCmd(
     Tcl_HashEntry *hPtr;
     Tcl_Obj *prefixObj;
     Class *clsPtr;
-    (void)dummy;
 
     if (objc != 3) {
 	Tcl_WrongNumArgs(interp, 1, objv, "className methodName");
@@ -1247,7 +1229,7 @@ InfoClassForwardCmd(
 
 static int
 InfoClassInstancesCmd(
-    ClientData dummy,
+    TCL_UNUSED(ClientData),
     Tcl_Interp *interp,
     int objc,
     Tcl_Obj *const objv[])
@@ -1257,7 +1239,6 @@ InfoClassInstancesCmd(
     int i;
     const char *pattern = NULL;
     Tcl_Obj *resultObj;
-    (void)dummy;
 
     if (objc != 2 && objc != 3) {
 	Tcl_WrongNumArgs(interp, 1, objv, "className ?pattern?");
@@ -1296,7 +1277,7 @@ InfoClassInstancesCmd(
 
 static int
 InfoClassMethodsCmd(
-    ClientData dummy,
+    TCL_UNUSED(ClientData),
     Tcl_Interp *interp,
     int objc,
     Tcl_Obj *const objv[])
@@ -1317,7 +1298,6 @@ InfoClassMethodsCmd(
     enum Scopes {
 	SCOPE_PRIVATE, SCOPE_PUBLIC, SCOPE_UNEXPORTED
     };
-    (void)dummy;
 
     if (objc < 2) {
 	Tcl_WrongNumArgs(interp, 1, objv, "className ?-option value ...?");
@@ -1413,7 +1393,7 @@ InfoClassMethodsCmd(
 
 static int
 InfoClassMethodTypeCmd(
-    ClientData dummy,
+    TCL_UNUSED(ClientData),
     Tcl_Interp *interp,
     int objc,
     Tcl_Obj *const objv[])
@@ -1421,7 +1401,6 @@ InfoClassMethodTypeCmd(
     Tcl_HashEntry *hPtr;
     Method *mPtr;
     Class *clsPtr;
-    (void)dummy;
 
     if (objc != 3) {
 	Tcl_WrongNumArgs(interp, 1, objv, "className methodName");
@@ -1466,7 +1445,7 @@ InfoClassMethodTypeCmd(
 
 static int
 InfoClassMixinsCmd(
-    ClientData dummy,
+    TCL_UNUSED(ClientData),
     Tcl_Interp *interp,
     int objc,
     Tcl_Obj *const objv[])
@@ -1474,7 +1453,6 @@ InfoClassMixinsCmd(
     Class *clsPtr, *mixinPtr;
     Tcl_Obj *resultObj;
     int i;
-    (void)dummy;
 
     if (objc != 2) {
 	Tcl_WrongNumArgs(interp, 1, objv, "className");
@@ -1509,7 +1487,7 @@ InfoClassMixinsCmd(
 
 static int
 InfoClassSubsCmd(
-    ClientData dummy,
+    TCL_UNUSED(ClientData),
     Tcl_Interp *interp,
     int objc,
     Tcl_Obj *const objv[])
@@ -1518,7 +1496,6 @@ InfoClassSubsCmd(
     Tcl_Obj *resultObj;
     int i;
     const char *pattern = NULL;
-    (void)dummy;
 
     if (objc != 2 && objc != 3) {
 	Tcl_WrongNumArgs(interp, 1, objv, "className ?pattern?");
@@ -1565,7 +1542,7 @@ InfoClassSubsCmd(
 
 static int
 InfoClassSupersCmd(
-    ClientData dummy,
+    TCL_UNUSED(ClientData),
     Tcl_Interp *interp,
     int objc,
     Tcl_Obj *const objv[])
@@ -1573,7 +1550,6 @@ InfoClassSupersCmd(
     Class *clsPtr, *superPtr;
     Tcl_Obj *resultObj;
     int i;
-    (void)dummy;
 
     if (objc != 2) {
 	Tcl_WrongNumArgs(interp, 1, objv, "className");
@@ -1605,7 +1581,7 @@ InfoClassSupersCmd(
 
 static int
 InfoClassVariablesCmd(
-    ClientData dummy,
+    TCL_UNUSED(ClientData),
     Tcl_Interp *interp,
     int objc,
     Tcl_Obj *const objv[])
@@ -1613,7 +1589,6 @@ InfoClassVariablesCmd(
     Class *clsPtr;
     Tcl_Obj *resultObj;
     int i, isPrivate = 0;
-    (void)dummy;
 
     if (objc != 2 && objc != 3) {
 	Tcl_WrongNumArgs(interp, 1, objv, "className ?-private?");
@@ -1660,14 +1635,13 @@ InfoClassVariablesCmd(
 
 static int
 InfoObjectCallCmd(
-    ClientData dummy,
+    TCL_UNUSED(ClientData),
     Tcl_Interp *interp,
     int objc,
     Tcl_Obj *const objv[])
 {
     Object *oPtr;
     CallContext *contextPtr;
-    (void)dummy;
 
     if (objc != 3) {
 	Tcl_WrongNumArgs(interp, 1, objv, "objName methodName");
@@ -1707,14 +1681,13 @@ InfoObjectCallCmd(
 
 static int
 InfoClassCallCmd(
-    ClientData dummy,
+    TCL_UNUSED(ClientData),
     Tcl_Interp *interp,
     int objc,
     Tcl_Obj *const objv[])
 {
     Class *clsPtr;
     CallChain *callPtr;
-    (void)dummy;
 
     if (objc != 3) {
 	Tcl_WrongNumArgs(interp, 1, objv, "className methodName");
diff --git a/generic/tclOOMethod.c b/generic/tclOOMethod.c
index bf010b9..1b071fa 100644
--- a/generic/tclOOMethod.c
+++ b/generic/tclOOMethod.c
@@ -80,12 +80,9 @@ static void		DeleteProcedureMethodRecord(ProcedureMethod *pmPtr);
 static void		DeleteProcedureMethod(void *clientData);
 static int		CloneProcedureMethod(Tcl_Interp *interp,
 			    void *clientData, void **newClientData);
-static void		MethodErrorHandler(Tcl_Interp *interp,
-			    Tcl_Obj *procNameObj);
-static void		ConstructorErrorHandler(Tcl_Interp *interp,
-			    Tcl_Obj *procNameObj);
-static void		DestructorErrorHandler(Tcl_Interp *interp,
-			    Tcl_Obj *procNameObj);
+static ProcErrorProc	MethodErrorHandler;
+static ProcErrorProc	ConstructorErrorHandler;
+static ProcErrorProc	DestructorErrorHandler;
 static Tcl_Obj *	RenderDeclarerName(void *clientData);
 static int		InvokeForwardMethod(void *clientData,
 			    Tcl_Interp *interp, Tcl_ObjectContext context,
@@ -93,13 +90,8 @@ static int		InvokeForwardMethod(void *clientData,
 static void		DeleteForwardMethod(void *clientData);
 static int		CloneForwardMethod(Tcl_Interp *interp,
 			    void *clientData, void **newClientData);
-static int		ProcedureMethodVarResolver(Tcl_Interp *interp,
-			    const char *varName, Tcl_Namespace *contextNs,
-			    int flags, Tcl_Var *varPtr);
-static int		ProcedureMethodCompiledVarResolver(Tcl_Interp *interp,
-			    const char *varName, int length,
-			    Tcl_Namespace *contextNs,
-			    Tcl_ResolvedVarInfo **rPtrPtr);
+static Tcl_ResolveVarProc	ProcedureMethodVarResolver;
+static Tcl_ResolveCompiledVarProc	ProcedureMethodCompiledVarResolver;
 
 /*
  * The types of methods defined by the core OO system.
@@ -135,7 +127,7 @@ static const Tcl_MethodType fwdMethodType = {
 
 Tcl_Method
 Tcl_NewInstanceMethod(
-    Tcl_Interp *dummy,		/* Unused. */
+    TCL_UNUSED(Tcl_Interp *),
     Tcl_Object object,		/* The object that has the method attached to
 				 * it. */
     Tcl_Obj *nameObj,		/* The name of the method. May be NULL; if so,
@@ -146,14 +138,13 @@ Tcl_NewInstanceMethod(
 				/* The type of method this is, which defines
 				 * how to invoke, delete and clone the
 				 * method. */
-    void *clientData)	/* Some data associated with the particular
+    void *clientData)		/* Some data associated with the particular
 				 * method to be created. */
 {
     Object *oPtr = (Object *) object;
     Method *mPtr;
     Tcl_HashEntry *hPtr;
     int isNew;
-    (void)dummy;
 
     if (nameObj == NULL) {
 	mPtr = (Method *)Tcl_Alloc(sizeof(Method));
@@ -209,7 +200,7 @@ Tcl_NewInstanceMethod(
 
 Tcl_Method
 Tcl_NewMethod(
-    Tcl_Interp *dummy,		/* The interpreter containing the class. */
+    TCL_UNUSED(Tcl_Interp *),
     Tcl_Class cls,		/* The class to attach the method to. */
     Tcl_Obj *nameObj,		/* The name of the object. May be NULL (e.g.,
 				 * for constructors or destructors); if so, up
@@ -219,14 +210,13 @@ Tcl_NewMethod(
 				/* The type of method this is, which defines
 				 * how to invoke, delete and clone the
 				 * method. */
-    void *clientData)	/* Some data associated with the particular
+    void *clientData)		/* Some data associated with the particular
 				 * method to be created. */
 {
     Class *clsPtr = (Class *) cls;
     Method *mPtr;
     Tcl_HashEntry *hPtr;
     int isNew;
-    (void)dummy;
 
     if (nameObj == NULL) {
 	mPtr = (Method *)Tcl_Alloc(sizeof(Method));
@@ -962,12 +952,11 @@ ProcedureMethodVarResolver(
     Tcl_Interp *interp,
     const char *varName,
     Tcl_Namespace *contextNs,
-    int flags,
+    TCL_UNUSED(int) /*flags*/,	/* Ignoring variable access flags (???) */
     Tcl_Var *varPtr)
 {
     int result;
     Tcl_ResolvedVarInfo *rPtr = NULL;
-    (void)flags;
 
     result = ProcedureMethodCompiledVarResolver(interp, varName,
 	    strlen(varName), contextNs, &rPtr);
@@ -1111,16 +1100,14 @@ ProcedureMethodCompiledVarDelete(
 
 static int
 ProcedureMethodCompiledVarResolver(
-    Tcl_Interp *dummy,
+    TCL_UNUSED(Tcl_Interp *),
     const char *varName,
     int length,
-    Tcl_Namespace *contextNs,
+    TCL_UNUSED(Tcl_Namespace *),
     Tcl_ResolvedVarInfo **rPtrPtr)
 {
     OOResVarInfo *infoPtr;
     Tcl_Obj *variableObj = Tcl_NewStringObj(varName, length);
-    (void)dummy;
-    (void)contextNs;
 
     /*
      * Do not create resolvers for cases that contain namespace separators or
@@ -1184,6 +1171,8 @@ RenderDeclarerName(
  * ----------------------------------------------------------------------
  */
 
+/* TODO: Check whether Tcl_AppendLimitedToObj() can work here. */
+
 #define LIMIT 60
 #define ELLIPSIFY(str,len) \
 	((len) > LIMIT ? LIMIT : (int)(len)), (str), ((len) > LIMIT ? "..." : "")
@@ -1191,7 +1180,8 @@ RenderDeclarerName(
 static void
 MethodErrorHandler(
     Tcl_Interp *interp,
-    Tcl_Obj *methodNameObj)
+    TCL_UNUSED(Tcl_Obj *) /*methodNameObj*/)
+	/* We pull the method name out of context instead of from argument */
 {
     size_t nameLen, objectNameLen;
     CallContext *contextPtr = (CallContext *)((Interp *) interp)->varFramePtr->clientData;
@@ -1199,7 +1189,6 @@ MethodErrorHandler(
     const char *objectName, *kindName, *methodName =
 	    TclGetStringFromObj(mPtr->namePtr, &nameLen);
     Object *declarerPtr;
-    (void)methodNameObj;
 
     if (mPtr->declaringObjectPtr != NULL) {
 	declarerPtr = mPtr->declaringObjectPtr;
@@ -1223,14 +1212,14 @@ MethodErrorHandler(
 static void
 ConstructorErrorHandler(
     Tcl_Interp *interp,
-    Tcl_Obj *methodNameObj)
+    TCL_UNUSED(Tcl_Obj *) /*methodNameObj*/)
+		/* Ignore. We know it is the constructor. */
 {
     CallContext *contextPtr = (CallContext *)((Interp *) interp)->varFramePtr->clientData;
     Method *mPtr = contextPtr->callPtr->chain[contextPtr->index].mPtr;
     Object *declarerPtr;
     const char *objectName, *kindName;
     size_t objectNameLen;
-    (void)methodNameObj;
 
     if (mPtr->declaringObjectPtr != NULL) {
 	declarerPtr = mPtr->declaringObjectPtr;
@@ -1253,14 +1242,14 @@ ConstructorErrorHandler(
 static void
 DestructorErrorHandler(
     Tcl_Interp *interp,
-    Tcl_Obj *methodNameObj)
+    TCL_UNUSED(Tcl_Obj *) /*methodNameObj*/)
+		/* Ignore. We know it is the destructor. */
 {
     CallContext *contextPtr = (CallContext *)((Interp *) interp)->varFramePtr->clientData;
     Method *mPtr = contextPtr->callPtr->chain[contextPtr->index].mPtr;
     Object *declarerPtr;
     const char *objectName, *kindName;
     size_t objectNameLen;
-    (void)methodNameObj;
 
     if (mPtr->declaringObjectPtr != NULL) {
 	declarerPtr = mPtr->declaringObjectPtr;
@@ -1535,13 +1524,12 @@ DeleteForwardMethod(
 
 static int
 CloneForwardMethod(
-    Tcl_Interp *dummy,
+    TCL_UNUSED(Tcl_Interp *),
     void *clientData,
     void **newClientData)
 {
     ForwardMethod *fmPtr = (ForwardMethod *)clientData;
     ForwardMethod *fm2Ptr = (ForwardMethod *)Tcl_Alloc(sizeof(ForwardMethod));
-    (void)dummy;
 
     fm2Ptr->prefixObj = fmPtr->prefixObj;
     Tcl_IncrRefCount(fm2Ptr->prefixObj);
diff --git a/generic/tclThreadAlloc.c b/generic/tclThreadAlloc.c
index fda42f8..e151ddc 100644
--- a/generic/tclThreadAlloc.c
+++ b/generic/tclThreadAlloc.c
@@ -135,7 +135,7 @@ static void	UnlockBucket(Cache *cachePtr, int bucket);
 static void	PutBlocks(Cache *cachePtr, int bucket, int numMove);
 static int	GetBlocks(Cache *cachePtr, int bucket);
 static Block *	Ptr2Block(void *ptr);
-static char *	Block2Ptr(Block *blockPtr, int bucket, unsigned int reqSize);
+static void *	Block2Ptr(Block *blockPtr, int bucket, unsigned int reqSize);
 static void	MoveObjs(Cache *fromPtr, Cache *toPtr, int numMove);
 static void	PutObjs(Cache *fromPtr, int numMove);
 
@@ -484,7 +484,7 @@ TclpRealloc(
 	memcpy(newPtr, ptr, reqSize);
 	TclpFree(ptr);
     }
-    return (char *)newPtr;
+    return newPtr;
 }
 
 /*
@@ -778,7 +778,7 @@ PutObjs(
  *----------------------------------------------------------------------
  */
 
-static char *
+static void *
 Block2Ptr(
     Block *blockPtr,
     int bucket,
@@ -793,7 +793,7 @@ Block2Ptr(
 #if RCHECK
     ((unsigned char *)(ptr))[reqSize] = MAGIC;
 #endif
-    return (char *) ptr;
+    return ptr;
 }
 
 static Block *