diff --git a/ChangeLog b/ChangeLog
index fe40a2714..77fa5e429 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-06-30  Robert Larice
+ * src/spicelib/devices/bsim4/b4noi.c ,
+ * src/spicelib/devices/hisim2/hsm2noi.c ,
+ * src/spicelib/devices/hisimhv/hsmhvnoi.c :
+   use TMALLOC, funcall, and NULL casts
+
 2011-06-30  Robert Larice
  * src/xspice/cm/cm.c :
    cm.c, swallow type conversion warnings
diff --git a/src/spicelib/devices/bsim4/b4noi.c b/src/spicelib/devices/bsim4/b4noi.c
index 0608b6983..99ed14f9c 100644
--- a/src/spicelib/devices/bsim4/b4noi.c
+++ b/src/spicelib/devices/bsim4/b4noi.c
@@ -149,16 +149,14 @@ double m;
                                   {    (void) sprintf(name, "onoise.%s%s",
                                                       here->BSIM4name,
                                                       BSIM4nNames[i]);
-                                       data->namelist = (IFuid *) trealloc(
-                                             (char *) data->namelist,
-                                             (data->numPlots + 1)
-                                             * sizeof(IFuid));
+                                       data->namelist = TREALLOC(IFuid,
+                                             data->namelist,
+                                             data->numPlots + 1);
                                        if (!data->namelist)
                                            return(E_NOMEM);
-                                       (*(SPfrontEnd->IFnewUid)) (ckt,
+                                       SPfrontEnd->IFnewUid (ckt,
                                           &(data->namelist[data->numPlots++]),
-                                          (IFuid) NULL, name, UID_OTHER,
-                                           NULL);
+                                          NULL, name, UID_OTHER, NULL);
                                        /* we've added one more plot */
                                   }
                                   break;
@@ -167,31 +165,27 @@ double m;
                                   {    (void) sprintf(name, "onoise_total.%s%s",
                                                       here->BSIM4name,
                                                       BSIM4nNames[i]);
-                                       data->namelist = (IFuid *) trealloc(
-                                             (char *) data->namelist,
-                                             (data->numPlots + 1)
-                                             * sizeof(IFuid));
+                                       data->namelist = TREALLOC(IFuid,
+                                             data->namelist,
+                                             data->numPlots + 1);
                                        if (!data->namelist)
                                            return(E_NOMEM);
-                                       (*(SPfrontEnd->IFnewUid)) (ckt,
+                                       SPfrontEnd->IFnewUid (ckt,
                                           &(data->namelist[data->numPlots++]),
-                                          (IFuid) NULL, name, UID_OTHER,
-                                           NULL);
+                                          NULL, name, UID_OTHER, NULL);
                                        /* we've added one more plot */
 
                                        (void) sprintf(name, "inoise_total.%s%s",
                                                       here->BSIM4name,
                                                       BSIM4nNames[i]);
-                                       data->namelist = (IFuid *) trealloc(
-                                             (char *) data->namelist,
-                                             (data->numPlots + 1)
-                                             * sizeof(IFuid));
+                                       data->namelist = TREALLOC(IFuid,
+                                             data->namelist,
+                                             data->numPlots + 1);
                                        if (!data->namelist)
                                            return(E_NOMEM);
-                                       (*(SPfrontEnd->IFnewUid)) (ckt,
+                                       SPfrontEnd->IFnewUid (ckt,
                                           &(data->namelist[data->numPlots++]),
-                                          (IFuid) NULL, name, UID_OTHER,
-                                          NULL);
+                                          NULL, name, UID_OTHER, NULL);
                                        /* we've added one more plot */
                                   }
                                   break;
diff --git a/src/spicelib/devices/hisim2/hsm2noi.c b/src/spicelib/devices/hisim2/hsm2noi.c
index 4c34e4a1f..aeb64a807 100644
--- a/src/spicelib/devices/hisim2/hsm2noi.c
+++ b/src/spicelib/devices/hisim2/hsm2noi.c
@@ -81,13 +81,12 @@ int HSM2noise (
 	      (void) sprintf(name, "onoise.%s%s", 
 			     (char *)here->HSM2name, HSM2nNames[i]);
 	      data->namelist = 
-		(IFuid *) trealloc((char *) data->namelist,
-				   (data->numPlots + 1) * sizeof(IFuid));
+		TREALLOC(IFuid, data->namelist, data->numPlots + 1);
 	      if (!data->namelist)
 		return(E_NOMEM);
-	      (*(SPfrontEnd->IFnewUid)) 
+	      SPfrontEnd->IFnewUid
 		(ckt, &(data->namelist[data->numPlots++]),
-		 (IFuid) NULL, name, UID_OTHER, NULL);
+		 NULL, name, UID_OTHER, NULL);
 	    }
 	    break;
 	  case INT_NOIZ:
@@ -95,24 +94,22 @@ int HSM2noise (
 	      (void) sprintf(name, "onoise_total.%s%s", 
 			     (char *)here->HSM2name, HSM2nNames[i]);
 	      data->namelist = 
-		(IFuid *) trealloc((char *) data->namelist,
-				   (data->numPlots + 1) * sizeof(IFuid));
+		TREALLOC(IFuid, data->namelist, data->numPlots + 1);
 	      if (!data->namelist)
 		return(E_NOMEM);
-	      (*(SPfrontEnd->IFnewUid)) 
+	      SPfrontEnd->IFnewUid
 		(ckt, &(data->namelist[data->numPlots++]),
-		 (IFuid) NULL, name, UID_OTHER, NULL);
+		 NULL, name, UID_OTHER, NULL);
 	      
 	      (void) sprintf(name, "inoise_total.%s%s", 
 			     (char *)here->HSM2name, HSM2nNames[i]);
 	      data->namelist = 
-		(IFuid *) trealloc((char *) data->namelist,
-				   (data->numPlots + 1) * sizeof(IFuid));
+		TREALLOC(IFuid, data->namelist, data->numPlots + 1);
 	      if (!data->namelist)
 		return(E_NOMEM);
-	      (*(SPfrontEnd->IFnewUid)) 
+	      SPfrontEnd->IFnewUid
 		(ckt, &(data->namelist[data->numPlots++]),
-		 (IFuid) NULL, name, UID_OTHER, NULL);
+		 NULL, name, UID_OTHER, NULL);
 	    }
 	    break;
 	  }
diff --git a/src/spicelib/devices/hisimhv/hsmhvnoi.c b/src/spicelib/devices/hisimhv/hsmhvnoi.c
index 4888539be..42b27ecaf 100644
--- a/src/spicelib/devices/hisimhv/hsmhvnoi.c
+++ b/src/spicelib/devices/hisimhv/hsmhvnoi.c
@@ -83,13 +83,12 @@ int HSMHVnoise (
 	      (void) sprintf(name, "onoise.%s%s", 
 			     (char *)here->HSMHVname, HSMHVnNames[i]);
 	      data->namelist = 
-		(IFuid *) trealloc((char *) data->namelist,
-				   (data->numPlots + 1) * sizeof(IFuid));
+		TREALLOC(IFuid, data->namelist, data->numPlots + 1);
 	      if (!data->namelist)
 		return(E_NOMEM);
-	      (*(SPfrontEnd->IFnewUid)) 
+	      SPfrontEnd->IFnewUid
 		(ckt, &(data->namelist[data->numPlots++]),
-		 (IFuid) NULL, name, UID_OTHER, NULL);
+		 NULL, name, UID_OTHER, NULL);
 	    }
 	    break;
 	  case INT_NOIZ:
@@ -97,24 +96,22 @@ int HSMHVnoise (
 	      (void) sprintf(name, "onoise_total.%s%s", 
 			     (char *)here->HSMHVname, HSMHVnNames[i]);
 	      data->namelist = 
-		(IFuid *) trealloc((char *) data->namelist,
-				   (data->numPlots + 1) * sizeof(IFuid));
+		TREALLOC(IFuid, data->namelist, data->numPlots + 1);
 	      if (!data->namelist)
 		return(E_NOMEM);
-	      (*(SPfrontEnd->IFnewUid)) 
+	      SPfrontEnd->IFnewUid
 		(ckt, &(data->namelist[data->numPlots++]),
-		 (IFuid) NULL, name, UID_OTHER, NULL);
+		 NULL, name, UID_OTHER, NULL);
 	      
 	      (void) sprintf(name, "inoise_total.%s%s", 
 			     (char *)here->HSMHVname, HSMHVnNames[i]);
 	      data->namelist = 
-		(IFuid *) trealloc((char *) data->namelist,
-				   (data->numPlots + 1) * sizeof(IFuid));
+		TREALLOC(IFuid, data->namelist, data->numPlots + 1);
 	      if (!data->namelist)
 		return(E_NOMEM);
-	      (*(SPfrontEnd->IFnewUid)) 
+	      SPfrontEnd->IFnewUid
 		(ckt, &(data->namelist[data->numPlots++]),
-		 (IFuid) NULL, name, UID_OTHER, NULL);
+		 NULL, name, UID_OTHER, NULL);
 	    }
 	    break;
 	  }