Index: generic/nsfCmdDefinitions.c
===================================================================
diff -u -N -rb4d254a45c4db35d7ae9fa0c8ca27512b2562cee -ra2021fcacd45bfbbe0d2dc11061e2a374c49726f
--- generic/nsfCmdDefinitions.c	(.../nsfCmdDefinitions.c)	(revision b4d254a45c4db35d7ae9fa0c8ca27512b2562cee)
+++ generic/nsfCmdDefinitions.c	(.../nsfCmdDefinitions.c)	(revision a2021fcacd45bfbbe0d2dc11061e2a374c49726f)
@@ -93,7 +93,7 @@
   
   NsfMutexLock(&cmdDefinitionMutex);
   
-  if (cmdDefinitionRefCount-- < 1) {
+  if (--cmdDefinitionRefCount < 1) {
     Tcl_DeleteHashTable(cmdDefinitionHashTablePtr);
   }
   
Index: generic/nsfEnumerationType.c
===================================================================
diff -u -N -r843e576364a54a491861bad94df4cbf31f878ab3 -ra2021fcacd45bfbbe0d2dc11061e2a374c49726f
--- generic/nsfEnumerationType.c	(.../nsfEnumerationType.c)	(revision 843e576364a54a491861bad94df4cbf31f878ab3)
+++ generic/nsfEnumerationType.c	(.../nsfEnumerationType.c)	(revision a2021fcacd45bfbbe0d2dc11061e2a374c49726f)
@@ -94,7 +94,7 @@
 
   NsfMutexLock(&enumerationMutex);
 
-  if (enumerationTypeRefCount-- < 1) {
+  if (--enumerationTypeRefCount < 1) {
     Tcl_DeleteHashTable(enumerationHashTablePtr);
   }
 
Index: generic/nsfFunPtrHashTable.c
===================================================================
diff -u -N -r2124b267f627f20447771d59cc28bd0e308fd1fb -ra2021fcacd45bfbbe0d2dc11061e2a374c49726f
--- generic/nsfFunPtrHashTable.c	(.../nsfFunPtrHashTable.c)	(revision 2124b267f627f20447771d59cc28bd0e308fd1fb)
+++ generic/nsfFunPtrHashTable.c	(.../nsfFunPtrHashTable.c)	(revision a2021fcacd45bfbbe0d2dc11061e2a374c49726f)
@@ -68,7 +68,7 @@
   FunPtrKey,         /* hashKeyProc*/
   CompareFunPtrKeys, /* compareKeysProc */
   AllocFunPtrEntry,  /* allocEntryProc */
-  FreeFunPtrEntry  /* freeEntryProc */
+  FreeFunPtrEntry    /* freeEntryProc */
 };
 
 /*
@@ -189,9 +189,10 @@
 static void
 FreeFunPtrEntry(Tcl_HashEntry *hPtr)        
 {
-    Nsf_AnyFun *keyVal = (Nsf_AnyFun *) hPtr->key.oneWordValue;
-    ckfree(keyVal);
-    ckfree(hPtr);
+  fprintf(stderr, "FreeFunPtrEntry is called!\n");
+  Nsf_AnyFun *keyVal = (Nsf_AnyFun *) hPtr->key.oneWordValue;
+  //ckfree(keyVal);
+  ckfree(hPtr);
 }