diff --git a/src/frontend/spiceif.c b/src/frontend/spiceif.c
index c1bbb3411..dfa6c08e6 100644
--- a/src/frontend/spiceif.c
+++ b/src/frontend/spiceif.c
@@ -615,7 +615,7 @@ finddev_special(
     int type = -1;
 
     // assert(third && *third == NULL); for all invocations
-    *devptr = ft_sim->findInstance (ckt, NULL, devptr, name);
+    *devptr = ft_sim->findInstance (ckt, NULL, NULL, name);
     if (*devptr) {
         *device_or_model = 0;
         return (*devptr)->GENmodPtr->GENmodType;
@@ -1217,7 +1217,7 @@ finddev(CKTcircuit *ckt, char *name, GENinstance **devptr, GENmodel **modptr)
     int type = -1;
 
     // assert(third && *third == NULL); for all invocations
-    *devptr = ft_sim->findInstance (ckt, NULL, devptr, name);
+    *devptr = ft_sim->findInstance (ckt, NULL, NULL, name);
     if (*devptr)
         return (*devptr)->GENmodPtr->GENmodType;
 
diff --git a/src/spicelib/analysis/noisean.c b/src/spicelib/analysis/noisean.c
index d6228a890..098bce2ed 100644
--- a/src/spicelib/analysis/noisean.c
+++ b/src/spicelib/analysis/noisean.c
@@ -49,7 +49,7 @@ NOISEan (CKTcircuit *ckt, int restart)
     code = CKTtypelook("Vsource");
     if (code != -1) {
         // assert(third && *third == NULL);
-        inst = CKTfndDev(ckt, NULL, &inst, job->input);
+        inst = CKTfndDev(ckt, NULL, NULL, job->input);
 	if (inst && !((VSRCinstance *)inst)->VSRCacGiven) {
 	    errMsg = TMALLOC(char, strlen(noacinput) + 1);
 	    strcpy(errMsg,noacinput);
@@ -60,7 +60,7 @@ NOISEan (CKTcircuit *ckt, int restart)
     code = CKTtypelook("Isource");
     if (code != -1 && inst==NULL) {
         // assert(third && *third == NULL);
-        inst = CKTfndDev(ckt, NULL, &inst, job->input);
+        inst = CKTfndDev(ckt, NULL, NULL, job->input);
         if (!inst) {
 	    /* XXX ??? */
             SPfrontEnd->IFerror (ERR_WARNING,
diff --git a/src/spicelib/analysis/tfanal.c b/src/spicelib/analysis/tfanal.c
index c5ab89075..05336f5be 100644
--- a/src/spicelib/analysis/tfanal.c
+++ b/src/spicelib/analysis/tfanal.c
@@ -52,7 +52,7 @@ TFanal(CKTcircuit *ckt, int restart)
     Vtype = CKTtypelook("Vsource");
     if(Itype != -1) {
         // assert(third && *third == NULL);
-        ptr = CKTfndDev(ckt, NULL, &ptr, job->TFinSrc);
+        ptr = CKTfndDev(ckt, NULL, NULL, job->TFinSrc);
         if (ptr) {
             job->TFinIsI = 1;
             job->TFinIsV = 0;
@@ -63,7 +63,7 @@ TFanal(CKTcircuit *ckt, int restart)
 
     if( (Vtype != -1) && (ptr==NULL) ) {
         // assert(third && *third == NULL);
-        ptr = CKTfndDev(ckt, NULL, &ptr, job->TFinSrc);
+        ptr = CKTfndDev(ckt, NULL, NULL, job->TFinSrc);
         job->TFinIsV = 1;
         job->TFinIsI = 0;
         if (!ptr) {
diff --git a/src/spicelib/devices/cktcrte.c b/src/spicelib/devices/cktcrte.c
index c72e78c72..73cf24fb7 100644
--- a/src/spicelib/devices/cktcrte.c
+++ b/src/spicelib/devices/cktcrte.c
@@ -29,7 +29,7 @@ CKTcrtElt(CKTcircuit *ckt, GENmodel *modPtr, GENinstance **inInstPtr, IFuid name
 	return E_NOMOD;
 
     // assert(third && *third == NULL);
-    instPtr = CKTfndDev(ckt, NULL, &instPtr, name);
+    instPtr = CKTfndDev(ckt, NULL, NULL, name);
 
     if (instPtr) { 
         if (inInstPtr)
diff --git a/src/tclspice.c b/src/tclspice.c
index 7ace2a183..475563461 100644
--- a/src/tclspice.c
+++ b/src/tclspice.c
@@ -1395,7 +1395,7 @@ get_mod_param TCL_CMDPROCARGS(clientData, interp, argc, argv)
     /* get the unique IFuid for name (device/model) */
     INPretrieve(&name, ft_curckt->ci_symtab);
     // assert(third && *third == NULL);
-    devptr = ft_sim->findInstance (ft_curckt->ci_ckt, NULL, &devptr, name);
+    devptr = ft_sim->findInstance (ft_curckt->ci_ckt, NULL, NULL, name);
     if (!devptr) {
         typecode = -1;
         devptr   = NULL;
diff --git a/src/unsupported/snstart.c b/src/unsupported/snstart.c
index ddb93e713..c67bdc450 100644
--- a/src/unsupported/snstart.c
+++ b/src/unsupported/snstart.c
@@ -43,7 +43,7 @@ SENstartup(CKTcircuit *ckt, int restart)
         fast = NULL;
 
         // assert(third && *third == NULL);
-        fast = CKTfndDev(ckt, NULL, &fast, ckt->CKTsenInfo->SENdevices[i]);
+        fast = CKTfndDev(ckt, NULL, NULL, ckt->CKTsenInfo->SENdevices[i]);
         if (!fast)
             return E_NODEV;