Index: generic/nsf.c
===================================================================
diff -u -ra02e56f649d5466d4f240350ac4551b7385d1f53 -r9ec1809a2cf35bba30d1c546dcf92675693108d3
--- generic/nsf.c	(.../nsf.c)	(revision a02e56f649d5466d4f240350ac4551b7385d1f53)
+++ generic/nsf.c	(.../nsf.c)	(revision 9ec1809a2cf35bba30d1c546dcf92675693108d3)
@@ -1303,7 +1303,7 @@
 
 static int
 NsfCallObjectUnknownHandler(Tcl_Interp *interp, Tcl_Obj *nameObj) {
-  int result = 0;
+  int result;
   Tcl_Obj *ov[3];
 
   /*fprintf(stderr, "try ::nsf::object::unknown for '%s'\n", ObjStr(nameObj));*/
@@ -5142,7 +5142,7 @@
       }
     }
     if (format) {
-      Tcl_Obj *savedResultObj = NULL;
+      Tcl_Obj *savedResultObj;
 
       ALLOC_ON_STACK(Tcl_Obj*, 3, ov);
       savedResultObj = Tcl_GetObjResult(interp);
@@ -5791,9 +5791,8 @@
 
 static void
 AssertionRemoveProc(NsfAssertionStore *aStore, CONST char *name) {
-  Tcl_HashEntry *hPtr;
   if (aStore) {
-    hPtr = Tcl_CreateHashEntry(&aStore->procs, name, NULL);
+    Tcl_HashEntry *hPtr = Tcl_CreateHashEntry(&aStore->procs, name, NULL);
     if (hPtr) {
       NsfProcAssertion *procAss =
         (NsfProcAssertion *) Tcl_GetHashValue(hPtr);
@@ -5832,10 +5831,10 @@
 
 static void
 AssertionRemoveStore(NsfAssertionStore *aStore) {
-  Tcl_HashSearch hSrch;
-  Tcl_HashEntry *hPtr;
-
   if (aStore) {
+    Tcl_HashSearch hSrch;
+    Tcl_HashEntry *hPtr;
+
     for (hPtr = Tcl_FirstHashEntry(&aStore->procs, &hSrch); hPtr;
          hPtr = Tcl_FirstHashEntry(&aStore->procs, &hSrch)) {
       /*
@@ -5970,7 +5969,6 @@
 static int
 AssertionCheck(Tcl_Interp *interp, NsfObject *object, NsfClass *cl,
                CONST char *method, int checkOption) {
-  NsfProcAssertion *procs;
   int result = TCL_OK;
   NsfAssertionStore *aStore;
 
@@ -5982,7 +5980,7 @@
   assert(object->opt);
 
   if (checkOption & object->opt->checkoptions) {
-    procs = AssertionFindProcs(aStore, method);
+    NsfProcAssertion *procs = AssertionFindProcs(aStore, method);
     if (procs) {
       switch (checkOption) {
       case CHECK_PRE:
@@ -14299,7 +14297,7 @@
 			    object, cl, methodName, frameType, 0);
 #endif
   } else if (result == TCL_OK) {
-    NsfCallStackContent *topCscPtr = NULL;
+    NsfCallStackContent *topCscPtr;
     int isLeafNext;
 
     /*
@@ -24080,7 +24078,7 @@
 static int
 NsfObjInfoPrecedenceMethod(Tcl_Interp *interp, NsfObject *object,
                                         int withIntrinsicOnly, CONST char *pattern) {
-  NsfClasses *precedenceList = NULL, *pl;
+  NsfClasses *precedenceList, *pl;
   Tcl_Obj *resultObj = Tcl_NewObj();
 
   precedenceList = ComputePrecedenceList(interp, object, pattern, !withIntrinsicOnly, 1);
Index: generic/nsfDebug.c
===================================================================
diff -u -r0a96330dfacd0df74641159e61dca74f0576ba1d -r9ec1809a2cf35bba30d1c546dcf92675693108d3
--- generic/nsfDebug.c	(.../nsfDebug.c)	(revision 0a96330dfacd0df74641159e61dca74f0576ba1d)
+++ generic/nsfDebug.c	(.../nsfDebug.c)	(revision 9ec1809a2cf35bba30d1c546dcf92675693108d3)
@@ -328,9 +328,6 @@
 NsfMemCountRelease() {
   int *tableInitialized;
   Tcl_HashTable *tablePtr = NsfMemCountGetTable(&tableInitialized);
-  Tcl_HashSearch search;
-  Tcl_HashEntry *hPtr;
-  int count = 0;
 
 #ifdef NSF_MEM_TRACE
   fprintf(stderr, "+++ release count %d\n", *tableInitialized);
@@ -342,6 +339,10 @@
   } 
 
   if (*tableInitialized == 1) {
+    Tcl_HashSearch search;
+    Tcl_HashEntry *hPtr;
+    int count = 0;
+
     fprintf(stderr, "******** NSF MEM Count *********\n*  count peak\n");
     
     for (hPtr = Tcl_FirstHashEntry(tablePtr, &search);  hPtr != NULL;