Index: generic/nsf.c
===================================================================
diff -u -r81788340d06828bb7131be38cc31858cf842612e -r5df12821bf0c331be48b7b01b986f9db6dab72c9
--- generic/nsf.c	(.../nsf.c)	(revision 81788340d06828bb7131be38cc31858cf842612e)
+++ generic/nsf.c	(.../nsf.c)	(revision 5df12821bf0c331be48b7b01b986f9db6dab72c9)
@@ -5917,7 +5917,7 @@
    * which will fail in such cases.
    */
 
-  if (!Tcl_Command_cmdEpoch(cmd)) {
+  if (Tcl_Command_cmdEpoch(cmd) == 0) {
     NsfObject *object = NsfGetObjectFromCmdPtr(cmd);
 
     /*fprintf(stderr, "NSDeleteChildren child %p (%s) epoch %d\n",
@@ -11080,7 +11080,7 @@
     while (cmdList != NULL) {
       /*fprintf(stderr, "FilterSearchProc found %s\n",
         Tcl_GetCommandName(interp, (Tcl_Command)cmdList->cmdPtr));*/
-      if (Tcl_Command_cmdEpoch(cmdList->cmdPtr)) {
+      if (Tcl_Command_cmdEpoch(cmdList->cmdPtr) != 0) {
         cmdList = cmdList->nextPtr;
       } else if (FilterActiveOnObj(interp, object, cmdList->cmdPtr)) {
         /* fprintf(stderr, "Filter <%s> -- Active on: %s\n",
@@ -17101,7 +17101,7 @@
    * slightly adapted to remove object dependencies.
    */
 
-  if (Tcl_Command_cmdEpoch(cmd)) {
+  if (Tcl_Command_cmdEpoch(cmd) != 0) {
 #if 1
     /*
      * It seems, as someone messed around with the shadowed proc. For now, we
@@ -23096,6 +23096,7 @@
   case NSF_PARAMS_LIST:      listObj = ParamDefsList(interp, paramsPtr, contextObject, pattern);   break;
   case NSF_PARAMS_NAMES:     listObj = ParamDefsNames(interp, paramsPtr, contextObject, pattern);  break;
   case NSF_PARAMS_SYNTAX:    listObj = NsfParamDefsSyntax(interp, paramsPtr, contextObject, pattern); break;
+  default:                   listObj = NULL; assert(0); /*should never happen */; break;
   }
 
   return listObj;
@@ -24246,7 +24247,7 @@
       key = Tcl_GetHashKey(tablePtr, hPtr);
       cmd = (Tcl_Command)Tcl_GetHashValue(hPtr);
       if (prefixLength != 0) {
-        Tcl_DStringTrunc(prefix, prefixLength);
+        Tcl_DStringSetLength(prefix, prefixLength);
       }
       methodTypeMatch = MethodTypeMatches(interp, methodType, cmd, object, key,
                                           withPer_object, &isObject);
@@ -24937,7 +24938,7 @@
 
     assert(tcd != NULL);
 
-    if (unlikely(Tcl_Command_cmdEpoch(tcd->aliasedCmd))) {
+    if (unlikely(Tcl_Command_cmdEpoch(tcd->aliasedCmd) != 0)) {
 
       /*fprintf(stderr, "NsfProcAliasMethod aliasedCmd %p epoch %p\n",
         tcd->aliasedCmd, Tcl_Command_cmdEpoch(tcd->aliasedCmd));*/
Index: generic/nsfError.c
===================================================================
diff -u -r878a74b68b15d4ee5c33d345e670f50ce7473ebc -r5df12821bf0c331be48b7b01b986f9db6dab72c9
--- generic/nsfError.c	(.../nsfError.c)	(revision 878a74b68b15d4ee5c33d345e670f50ce7473ebc)
+++ generic/nsfError.c	(.../nsfError.c)	(revision 5df12821bf0c331be48b7b01b986f9db6dab72c9)
@@ -478,7 +478,7 @@
     Tcl_DStringAppend(dsPtr, pPtr->name, -1);
     Tcl_DStringAppend(dsPtr, ", ", -1);
   }
-  Tcl_DStringTrunc(dsPtr, Tcl_DStringLength(dsPtr) - 2);
+  Tcl_DStringSetLength(dsPtr, Tcl_DStringLength(dsPtr) - 2);
   Tcl_DStringAppend(dsPtr, ";\n", 2);
 
   NsfArgumentError(interp, Tcl_DStringValue(dsPtr), paramPtr, (object != NULL) ? object->cmdName : NULL,
Index: generic/nsfProfile.c
===================================================================
diff -u -r2076cebc74107d25878e6a95688db6b444fd6b0e -r5df12821bf0c331be48b7b01b986f9db6dab72c9
--- generic/nsfProfile.c	(.../nsfProfile.c)	(revision 2076cebc74107d25878e6a95688db6b444fd6b0e)
+++ generic/nsfProfile.c	(.../nsfProfile.c)	(revision 5df12821bf0c331be48b7b01b986f9db6dab72c9)
@@ -603,7 +603,7 @@
     Tcl_DStringAppendElement(&traceLabel, Tcl_DStringValue(&ds));
     Tcl_DStringAppend(&traceLabel, " ", 1);
 
-    Tcl_DStringTrunc(&ds, 0);
+    Tcl_DStringSetLength(&ds, 0);
     NsfProfileMethodLabel(&ds, cl, methodName);
     Tcl_DStringAppendElement(&traceLabel, Tcl_DStringValue(&ds));
 
@@ -634,7 +634,7 @@
     Tcl_DStringAppendElement(&traceLabel, Tcl_DStringValue(&ds));
     Tcl_DStringAppend(&traceLabel, " ", 1);
 
-    Tcl_DStringTrunc(&ds, 0);
+    Tcl_DStringSetLength(&ds, 0);
     NsfProfileMethodLabel(&ds, cl, methodName);
     Tcl_DStringAppendElement(&traceLabel, Tcl_DStringValue(&ds));
 
@@ -842,7 +842,7 @@
   profilePtr->overallTime = 0;
   profilePtr->depth = 0;
 
-  Tcl_DStringTrunc(&profilePtr->traceDs, 0);
+  Tcl_DStringSetLength(&profilePtr->traceDs, 0);
 }
 
 /*