Index: generic/nsf.c
===================================================================
diff -u -rffd5b8ff74134cc891b9715cf1dd949193065b61 -r73d590ba4b6979a5de2606c604329be45fc7bed2
--- generic/nsf.c	(.../nsf.c)	(revision ffd5b8ff74134cc891b9715cf1dd949193065b61)
+++ generic/nsf.c	(.../nsf.c)	(revision 73d590ba4b6979a5de2606c604329be45fc7bed2)
@@ -80,7 +80,7 @@
   ClientData oldDeleteData;
   Tcl_CmdDeleteProc *oldDeleteProc;
   NsfParamDefs *paramDefs;
-  INTERP_DECL1;
+  INTERP_MEMBER_DECL
 } NsfProcContext;
 
 /*
@@ -96,7 +96,7 @@
 typedef struct SetterCmdClientData {
   NsfObject *object;
   Nsf_Param *paramsPtr;
-  INTERP_DECL1;
+  INTERP_MEMBER_DECL
 } SetterCmdClientData;
 
 typedef struct ForwardCmdClientData {
@@ -115,7 +115,7 @@
   Tcl_Obj *prefix;
   int nr_subcommands;
   Tcl_Obj *subcommands;
-  INTERP_DECL1;
+  INTERP_MEMBER_DECL
 } ForwardCmdClientData;
 
 typedef struct AliasCmdClientData {
@@ -2995,7 +2995,7 @@
   NsfObject *lastObject;
   Tcl_Var var;
   Tcl_Obj *nameObj;
-  INTERP_DECL1;
+  INTERP_MEMBER_DECL
 } NsfResolvedVarInfo;
 
 /*
@@ -11130,29 +11130,31 @@
     ObjStr(objv[0]), fullMethodName, procNameObj, ObjStr(procNameObj));*/
   Tcl_NRAddCallback(interp, ProcDispatchFinalize,
 		    (ClientData)fullMethodName, pcPtr,
-#if defined(NSF_PROFILE)
+#  if defined(NSF_PROFILE)
 		    (ClientData)(unsigned long)trt.tv_usec,
 		    (ClientData)(unsigned long)trt.tv_sec
-#else
+#  else
 		    NULL,
 		    NULL
-#endif
+#  endif
 		    );
   result = TclNRInterpProcCore(interp, procNameObj, 1, &MakeProcError);
 # else
+  {
   ClientData data[4] = {
     (ClientData)fullMethodName,
     pcPtr,
-#if defined(NSF_PROFILE)
+#  if defined(NSF_PROFILE)
     (ClientData)(unsigned long)trt.tv_usec,
     (ClientData)(unsigned long)trt.tv_sec
-#else
+#  else
     NULL,
     NULL
-#endif
+#  endif
   };
   result = TclObjInterpProcCore(interp, procNameObj, 1, &MakeProcError);
   result = ProcDispatchFinalize(data, interp, result);
+  }
 # endif
 #endif
   return result;
@@ -18882,7 +18884,7 @@
   Nsf_Param *paramPtr;
   int refCount;
   int canFree;
-  INTERP_DECL1;
+  INTERP_MEMBER_DECL
 } NsfParamWrapper;
 
 static Tcl_DupInternalRepProc	ParamDupInteralRep;
Index: generic/nsfInt.h
===================================================================
diff -u -rffd5b8ff74134cc891b9715cf1dd949193065b61 -r73d590ba4b6979a5de2606c604329be45fc7bed2
--- generic/nsfInt.h	(.../nsfInt.h)	(revision ffd5b8ff74134cc891b9715cf1dd949193065b61)
+++ generic/nsfInt.h	(.../nsfInt.h)	(revision 73d590ba4b6979a5de2606c604329be45fc7bed2)
@@ -96,6 +96,7 @@
 #  define INTERP1 interp
 #  define INTERP_DECL Tcl_Interp *interp,
 #  define INTERP_DECL1 Tcl_Interp *interp
+#  define INTERP_MEMBER_DECL Tcl_Interp *interp;
 #  define INTERP_MEMBER_GET(ptr) Tcl_Interp *interp = (ptr)->interp;
 #  define INTERP_MEMBER_SET(ptr, value) (ptr)->interp = (value);
 #  define MEM_COUNT_ALLOC(id,p) NsfMemCountAlloc(interp, id, p)
@@ -107,6 +108,7 @@
 #  define INTERP1
 #  define INTERP_DECL
 #  define INTERP_DECL1
+#  define INTERP_MEMBER_DECL
 #  define INTERP_MEMBER_GET(ptr)
 #  define INTERP_MEMBER_SET(ptr, value)
 #  define MEM_COUNT_ALLOC(id,p)
@@ -540,7 +542,7 @@
   Tcl_Command cmd;
   NsfParamDefs *paramDefs;
   int with_ad;
-  INTERP_DECL1;
+  INTERP_MEMBER_DECL
 } NsfProcClientData;
 
 typedef enum SystemMethodsIdx {