code cleanup

15 years ago · 0b6a557334
165 changed files with 723 additions and 725 deletions
--- a/11
+++ b/11
@ -1,7 +1,14 @@
+2011-04-27  Robert Larice
+ * */** :
+    code cleanup
+      function pointer invocation, (*p)(...)  --->  p(...)
+      structure access,            (*p).foo   --->  p->foo
+      some casts, etc
+
 2011-04-17 Dietmar Warning
 * /bsim3v2/b3v2set.c, /bsim3/b3set.c: allow multiple call to setup w/ correct node collapsing
- 
- 2011-04-15  Robert Larice
+
+2011-04-15  Robert Larice
 * src/spicelib/analysis/cktsens.c :
   fix allocation and ownership of auxiliary CKTmatrix CKTrhs etc objects
   FIXME: invoke release_context() when returning due to errors
--- a/doc/ngspice.texi
+++ b/doc/ngspice.texi
@ -11448,7 +11448,7 @@ Another function modified to support the new parameters is the

@example
            if(here->MOS3l - 2 * model->MOS3latDiff <=0) @{
-                (*(SPfrontEnd->IFerror))(ERR_FATAL,
+                SPfrontEnd->IFerror (ERR_FATAL,
                        "%s: effective channel length less than zero",
                        &(here->MOS3name));
                return(E_BADPARM);
@ -11462,7 +11462,7 @@ And the new one:
 ...
            if(here->MOS3l - 2 * model->MOS3latDiff +
                                 model->MOS3lengthAdjust <1e-6) @{
-                (*(SPfrontEnd->IFerror))(ERR_FATAL,
+                SPfrontEnd->IFerror (ERR_FATAL,
                        "%s: effective channel length less than zero",
                        &(here->MOS3name));
                return(E_PARMVAL);
@ -11471,7 +11471,7 @@ And the new one:

            if(here->MOS3w - 2 * model->MOS3widthNarrow +
                                 model->MOS3widthAdjust <1e-6) @{
-                (*(SPfrontEnd->IFerror))(ERR_FATAL,
+                SPfrontEnd->IFerror (ERR_FATAL,
                        "%s: effective channel width less than zero",
                        &(here->MOS3name));
                return(E_PARMVAL);
--- a/src/frontend/arg.c
+++ b/src/frontend/arg.c
@ -76,7 +76,7 @@ void arg_plot(wordlist *wl, struct comm *command)
 void arg_load(wordlist *wl, struct comm *command)
 {
      /* just call com_load */
-      (*command->co_func) (wl);
+      command->co_func (wl);

 }

@ -122,7 +122,7 @@ common(char *string, struct wordlist *wl, struct comm *command)

      w = process(w);
      /* O.K. now call fn */
-      (*command->co_func) (w);
+      command->co_func (w);
    }

 }
--- a/src/frontend/control.c
+++ b/src/frontend/control.c
@ -228,14 +228,14 @@ docommand(wordlist *wlist)
        {
            if (nargs < command->co_minargs) {
 		if (command->co_argfn) {
-		    (*command->co_argfn) (wlist->wl_next, command);
+		    command->co_argfn (wlist->wl_next, command);
 		} else {
 		    fprintf(cp_err, "%s: too few args.\n", s);
 		}
            } else if (nargs > command->co_maxargs) {
                fprintf(cp_err, "%s: too many args.\n", s);
            } else {
-                (*command->co_func) (wlist->wl_next);
+                command->co_func (wlist->wl_next);
            }
        }

--- a/src/frontend/device.c
+++ b/src/frontend/device.c
@ -598,10 +598,10 @@ printvals(dgen *dg, IFparm *p, int i)
    int         n;

    if (dg->flags & DGEN_INSTANCE)
-        (*ft_sim->askInstanceQuest)(ft_curckt->ci_ckt, dg->instance,
+        ft_sim->askInstanceQuest (ft_curckt->ci_ckt, dg->instance,
            p->id, &val, &val);
    else
-        (*ft_sim->askModelQuest)(ft_curckt->ci_ckt, dg->model,
+        ft_sim->askModelQuest (ft_curckt->ci_ckt, dg->model,
            p->id, &val, &val);

    if (p->dataType & IF_VECTOR)
@ -685,10 +685,10 @@ printvals_old(dgen *dg, IFparm *p, int i)
    int         n, error;

    if (dg->flags & DGEN_INSTANCE)
-        error = (*ft_sim->askInstanceQuest)(ft_curckt->ci_ckt, dg->instance,
+        error = ft_sim->askInstanceQuest (ft_curckt->ci_ckt, dg->instance,
            p->id, &val, &val);
    else
-        error = (*ft_sim->askModelQuest)(ft_curckt->ci_ckt, dg->model,
+        error = ft_sim->askModelQuest (ft_curckt->ci_ckt, dg->model,
            p->id, &val, &val);

    if (p->dataType & IF_VECTOR)
@ -822,10 +822,10 @@ old_show(wordlist *wl)
        if (parms) {
            for (tw = parms; tw; tw = tw->wl_next) {
                nn = copy(devs->wl_word);
-                v = (*if_getparam)(ft_curckt->ci_ckt,
+                v = if_getparam (ft_curckt->ci_ckt,
                        &nn, tw->wl_word, 0, 0);
                if (!v)
-                    v = (*if_getparam)(ft_curckt->ci_ckt,
+                    v = if_getparam (ft_curckt->ci_ckt,
                            &nn, tw->wl_word, 0, 1);
                if (v) {
                    out_printf("\t%s =", tw->wl_word);
@ -837,9 +837,9 @@ old_show(wordlist *wl)
            }
        } else {
            nn = copy(devs->wl_word);
-            v = (*if_getparam)(ft_curckt->ci_ckt, &nn, "all", 0, 0);
+            v = if_getparam (ft_curckt->ci_ckt, &nn, "all", 0, 0);
            if (!v)
-                v = (*if_getparam)(ft_curckt->ci_ckt, &nn, "all", 0, 1);
+                v = if_getparam (ft_curckt->ci_ckt, &nn, "all", 0, 1);
            while (v) {
                out_printf("\t%s =", v->va_name);
                for (ww = cp_varwl(v); ww; ww = ww->wl_next)
--- a/src/frontend/display.c
+++ b/src/frontend/display.c
@ -172,7 +172,7 @@ DevInit(void)
 	externalerror(
 	 "no graphics interface;\n please check if X-server is running, \n or ngspice is compiled properly (see INSTALL)");
 	dispdev = FindDev("error");
-    } else if ((*(dispdev->Init))()) {
+    } else if (dispdev->Init()) {
      fprintf(cp_err,
        "Warning: can't initialize display device for graphics.\n");
      dispdev = FindDev("error");
@ -185,69 +185,69 @@ int
 NewViewport(GRAPH *pgraph)
 {

-    return (*(dispdev->NewViewport))(pgraph);
+    return dispdev->NewViewport (pgraph);

 }

 void DevClose(void)
 {

-    (*(dispdev->Close))();
+    dispdev->Close();

 }

 void DevClear(void)
 {

-    (*(dispdev->Clear))();
+    dispdev->Clear();

 }

 void DevDrawLine(int x1, int y1, int x2, int y2)
 {
-    (*(dispdev->DrawLine))(x1, y1, x2, y2);
+    dispdev->DrawLine (x1, y1, x2, y2);

 }

 void DevDrawArc(int x0, int y0, int radius, double theta, double delta_theta)
 {

-    (*(dispdev->DrawArc))(x0, y0, radius, theta, delta_theta);
+    dispdev->DrawArc (x0, y0, radius, theta, delta_theta);

 }

 void DevDrawText(char *text, int x, int y)
 {

-    (*(dispdev->DrawText))(text, x, y);
+    dispdev->DrawText (text, x, y);

 }

 void DefineColor(int colorid, double red, double green, double blue)
 {

-    (*(dispdev->DefineColor))(colorid, red, green, blue);
+    dispdev->DefineColor (colorid, red, green, blue);

 }

 void DefineLinestyle(int linestyleid, int mask)
 {

-    (*(dispdev->DefineLinestyle))(linestyleid, mask);
+    dispdev->DefineLinestyle (linestyleid, mask);

 }

 void SetLinestyle(int linestyleid)
 {

-    (*(dispdev->SetLinestyle))(linestyleid);
+    dispdev->SetLinestyle (linestyleid);

 }

 void SetColor(int colorid)
 {

-    (*(dispdev->SetColor))(colorid);
+    dispdev->SetColor (colorid);

 }

@ -255,7 +255,7 @@ void DevUpdate(void)
 {

    if (dispdev)
-	    (*(dispdev->Update))();
+	    dispdev->Update();

 }

@ -303,14 +303,14 @@ gen_DatatoScreen(GRAPH *graph, double x, double y, int *screenx, int *screeny)
 void DatatoScreen(GRAPH *graph, double x, double y, int *screenx, int *screeny)
 {

-    (*(dispdev->DatatoScreen))(graph, x, y, screenx, screeny);
+    dispdev->DatatoScreen (graph, x, y, screenx, screeny);

 }

 void Input(REQUEST *request, RESPONSE *response)
 {

-    (*(dispdev->Input))(request, response);
+    dispdev->Input (request, response);

 }

@ -393,9 +393,9 @@ int DevSwitch(char *devname)
        lastdev = NULL;
        return (1);
      }
-      (*(dispdev->Init))();
+      dispdev->Init();
    } else {
-      (*(dispdev->Close))();
+      dispdev->Close();
      dispdev = lastdev;
      lastdev = NULL;
    }
--- a/src/frontend/evaluate.c
+++ b/src/frontend/evaluate.c
@ -64,7 +64,7 @@ ft_evaluate(struct pnode *node)
            if(node->pn_op->op_num == PT_OP_TERNARY)
                d = ft_ternary(node);
            else
-                d = (*node->pn_op->op_func.binary) (node->pn_left, node->pn_right);
+                d = node->pn_op->op_func.binary (node->pn_left, node->pn_right);
        }
    } else {
        fprintf(cp_err, "ft_evaluate: Internal Error: bad node\n");
@ -168,7 +168,7 @@ doop_funcall(

    (void) signal(SIGILL, (SIGNAL_FUNCTION) sig_matherr);

-    data = (*func) (data1, data2, datatype1, datatype2, length);
+    data = func (data1, data2, datatype1, datatype2, length);

    /* Back to normal */
    (void) signal(SIGILL, SIG_DFL);
@ -842,14 +842,14 @@ apply_func_funcall(struct func *func, struct dvec *v, int *newlength, short int
    {
        void *(*f)(void *data, short int type, int length,
                   int *newlength, short int *newtype, struct plot *, struct plot *, int) = (void *(*)(void *, short int, int, int *, short int *, struct plot *, struct plot *, int)) func->fu_func;
-        data = (*f) (
+        data = f (
            isreal(v) ? (void *) v->v_realdata : (void *) v->v_compdata,
            (short) (isreal(v) ? VF_REAL : VF_COMPLEX),
            v->v_length,
            newlength, newtype,
            v->v_plot, plot_cur, v->v_dims[0]);
    } else {
-        data = (*func->fu_func) (
+        data = func->fu_func (
            isreal(v) ? (void *) v->v_realdata : (void *) v->v_compdata,
            (short) (isreal(v) ? VF_REAL : VF_COMPLEX),
            v->v_length,
--- a/src/frontend/gens.c
+++ b/src/frontend/gens.c
@ -19,7 +19,7 @@ void
 wl_forall(wordlist *wl, void (*fn)(wordlist*, dgen*), dgen *data)
 {
 	while (wl) {
-		(*fn)(wl, data);
+		fn (wl, data);
 		wl = wl->wl_next;
 	}
 }
@ -74,7 +74,7 @@ dgen_for_n(dgen *dg, int n, int (*fn) (dgen*, IFparm*, int), IFparm *data, int s
 	k = 0;
 	for (i = 0; dgxp && dgxp->dev_type_no == dnum && i < n; i++) {
 		/*printf("Loop at %d\n", i);*/
-		j = (*fn)(dgxp, data, subindex);
+		j = fn (dgxp, data, subindex);
 		if (j > k)
 			k = j;
 		dgen_next(&dgxp);
--- a/src/frontend/shyu.c
+++ b/src/frontend/shyu.c
@ -61,14 +61,14 @@ if_sens_run(CKTcircuit *t, wordlist *args, INPtables *tab)
    INPgetTok(&line,&token,1);

    if(ft_curckt->ci_specTask) {
-        err=(*(ft_sim->deleteTask))(ft_curckt->ci_ckt,
+        err = ft_sim->deleteTask (ft_curckt->ci_ckt,
        ft_curckt->ci_specTask);
        if(err) {
            ft_sperror(err,"deleteTask");
            return(0); /* temporary */
        }
    }
-    err = (*(ft_sim->newTask))(ft_curckt->ci_ckt,
+    err = ft_sim->newTask (ft_curckt->ci_ckt,
 	    &(ft_curckt->ci_specTask), "special",
 	    &(ft_curckt->ci_defTask));
    if(err) {
@ -82,7 +82,7 @@ if_sens_run(CKTcircuit *t, wordlist *args, INPtables *tab)
        }
    } 
    if(which != -1) {
-        err = (*(ft_sim->newAnalysis))(ft_curckt->ci_ckt,which,"options",
+        err = ft_sim->newAnalysis (ft_curckt->ci_ckt, which, "options",
 		&(ft_curckt->ci_specOpt), ft_curckt->ci_specTask);
        if(err) {
            ft_sperror(err,"createOptions");
@ -103,7 +103,7 @@ if_sens_run(CKTcircuit *t, wordlist *args, INPtables *tab)
        }
    } 
    if(which != -1) {
-        err = (*(ft_sim->newAnalysis))(ft_curckt->ci_ckt,which,"sense",
+        err = ft_sim->newAnalysis (ft_curckt->ci_ckt, which, "sense",
        &(senseJob),ft_curckt->ci_specTask);
        if(err) {
            ft_sperror(err,"createSense");
@ -126,7 +126,7 @@ if_sens_run(CKTcircuit *t, wordlist *args, INPtables *tab)
            }
        } 
        if(which != -1) {
-            err = (*(ft_sim->newAnalysis))(ft_curckt->ci_ckt,which,"acan",
+            err = ft_sim->newAnalysis (ft_curckt->ci_ckt, which, "acan",
            &(acJob),ft_curckt->ci_specTask);
            if(err) {
                ft_sperror(err,"createAC"); /* or similar error message */
@ -170,7 +170,7 @@ if_sens_run(CKTcircuit *t, wordlist *args, INPtables *tab)
            "DC operating point analysis unsupported\n"));
        }
        else {
-            err = (*(ft_sim->newAnalysis))(ft_curckt->ci_ckt,which,"dcop", 
+            err = ft_sim->newAnalysis (ft_curckt->ci_ckt, which, "dcop",
                    &(opJob),ft_curckt->ci_specTask);
            if(err) {
                ft_sperror(err,"createOP"); /* or similar error message */
@ -192,7 +192,7 @@ if_sens_run(CKTcircuit *t, wordlist *args, INPtables *tab)
            current->error = INPerrCat(current->error,INPmkTemp(
            "DC transfer curve analysis unsupported\n"));
        }
-        err = (*(ft_sim->newAnalysis))(ft_curckt->ci_ckt,which,"DCtransfer", 
+        err = ft_sim->newAnalysis (ft_curckt->ci_ckt, which, "DCtransfer",
                &(dcJob),ft_curckt->ci_specTask);
        if(err) {
            ft_sperror(err,"createOP"); /* or similar error message */
@ -239,7 +239,7 @@ if_sens_run(CKTcircuit *t, wordlist *args, INPtables *tab)
            }
        } 
        if(which != -1) {
-            err = (*(ft_sim->newAnalysis))(ft_curckt->ci_ckt,which,"tranan",
+            err = ft_sim->newAnalysis (ft_curckt->ci_ckt, which, "tranan",
            &(tranJob),ft_curckt->ci_specTask);
            if(err) {
                ft_sperror(err,"createTRAN"); 
@ -304,7 +304,7 @@ next:
                    dataType & IF_FLAG) {
                    /* one of the keywords! */
                    ptemp.iValue = 1;
-                    error = (*(ft_sim->setAnalysisParm))(ckt,
+                    error = ft_sim->setAnalysisParm (ckt,
                        senseJob, ft_sim->analyses[save]->
                        analysisParms[i].id,&ptemp,(IFvalue*)NULL);
                    if(error) current->error = INPerrCat(
@ -314,7 +314,7 @@ next:
                    parm = INPgetValue(ckt,&line,ft_sim->
                        analyses[save]->analysisParms[i].
                        dataType,tab);
-                    error = (*(ft_sim->setAnalysisParm))(ckt,
+                    error = ft_sim->setAnalysisParm (ckt,
                        senseJob, ft_sim->analyses[save]->
                        analysisParms[i].id,parm,(IFvalue*)NULL);
                    if(error) current->error = INPerrCat(
@ -333,7 +333,7 @@ next:



-    if((err = (*(ft_sim->doAnalyses))(ckt, 1, ft_curckt->ci_curTask))!=OK){
+    if((err = ft_sim->doAnalyses (ckt, 1, ft_curckt->ci_curTask)) != OK) {
        ft_sperror(err, "doAnalyses");
        return(0);/* temporary */
    }
--- a/src/frontend/spiceif.c
+++ b/src/frontend/spiceif.c
@ -103,7 +103,7 @@ if_inpdeck(struct line *deck, INPtables **tab)
    *tab = INPtabInit(i);
    ft_curckt->ci_symtab = *tab;

-    err = (*(ft_sim->newCircuit))(&ckt);
+    err = ft_sim->newCircuit (&ckt);
    if (err != OK) {
        ft_sperror(err, "CKTinit");
        return (NULL);
@ -117,12 +117,9 @@ if_inpdeck(struct line *deck, INPtables **tab)
        return(NULL);
    }
 #if (0)
-       err = 
-     (*(ft_sim->newTask))(ckt, &(ft_curckt->ci_defTask), taskUid);
+       err = ft_sim->newTask (ckt, &(ft_curckt->ci_defTask), taskUid);
 #else /*CDHW*/
-       err = 
-       (*(ft_sim->newTask))(ckt, &(ft_curckt->ci_defTask), taskUid,
-       NULL);
+       err = ft_sim->newTask (ckt, &(ft_curckt->ci_defTask), taskUid, NULL);
 #endif
    if(err) {
        ft_sperror(err,"newTask");
@ -146,7 +143,7 @@ if_inpdeck(struct line *deck, INPtables **tab)
            return(NULL);
        }

-        err = (*(ft_sim->newAnalysis))(ft_curckt->ci_ckt,which,optUid,
+        err = ft_sim->newAnalysis (ft_curckt->ci_ckt, which, optUid,
                &(ft_curckt->ci_defOpt),
                ft_curckt->ci_defTask);
 		
@ -236,7 +233,7 @@ if_run(CKTcircuit *t, char *what, wordlist *args, INPtables *tab)
 	   if (ft_curckt->ci_specTask == ft_curckt->ci_defTask) { /*CDHW*/
              printf("Oh dear...something bad has happened to the options.\n");
            }
-            err=(*(ft_sim->deleteTask))(ft_curckt->ci_ckt,
+            err = ft_sim->deleteTask (ft_curckt->ci_ckt,
                    ft_curckt->ci_specTask);
            if(err) {
                ft_sperror(err,"deleteTask");
@ -255,10 +252,10 @@ ci_specTask will point to it CDHW*/
            return(2);
        }
 #if (0)
-        err = (*(ft_sim->newTask))(ft_curckt->ci_ckt, 
+        err = ft_sim->newTask (ft_curckt->ci_ckt,
                &(ft_curckt->ci_specTask), specUid);
 #else /*CDHW*/
-        err = (*(ft_sim->newTask))(ft_curckt->ci_ckt, 
+        err = ft_sim->newTask (ft_curckt->ci_ckt,
                 &(ft_curckt->ci_specTask),
                 specUid, &(ft_curckt->ci_defTask));
 #endif        
@ -282,7 +279,7 @@ ci_specTask will point to it CDHW*/
                ft_sperror(err,"newUid");
                return(2);
            }
-            err = (*(ft_sim->newAnalysis))(ft_curckt->ci_ckt,which,optUid,
+            err = ft_sim->newAnalysis (ft_curckt->ci_ckt, which, optUid,
                    &(ft_curckt->ci_specOpt),
                    ft_curckt->ci_specTask);
 		    
@ -339,7 +336,7 @@ ci_specTask will point to it CDHW*/
 /*CDHW Run the analysis pointed to by ci_curTask CDHW*/

        ft_curckt->ci_curOpt = ft_curckt->ci_defOpt;	
-        if ((err = (*(ft_sim->doAnalyses))(ckt, 1, ft_curckt->ci_curTask))!=OK){
+        if ((err = ft_sim->doAnalyses (ckt, 1, ft_curckt->ci_curTask)) != OK){
            ft_sperror(err, "doAnalyses");
            /* wrd_end(); */
 	    if (err == E_PAUSE)
@ -348,7 +345,7 @@ ci_specTask will point to it CDHW*/
 		return (2);
        }
    } else if (eq(what, "resume")) {
-        if ((err = (*(ft_sim->doAnalyses))(ckt, 0, ft_curckt->ci_curTask))!=OK){
+        if ((err = ft_sim->doAnalyses (ckt, 0, ft_curckt->ci_curTask)) != OK){
            ft_sperror(err, "doAnalyses");
            /* wrd_end(); */
 	    if (err == E_PAUSE)
@ -497,12 +494,12 @@ if_option(CKTcircuit *ckt, char *name, enum cp_types type, void *value)
    }

 #if (0)
-     if ((err = (*(ft_sim->setAnalysisParm))(cc, ft_curckt->ci_curOpt,
+     if ((err = ft_sim->setAnalysisParm (cc, ft_curckt->ci_curOpt,
             ft_sim->analyses[which]->analysisParms[i].id, &pval,
             (IFvalue *)NULL)) != OK)
         ft_sperror(err, "setAnalysisParm(options) ci_curOpt");
 #else /*CDHW*/
-     if ((err = (*(ft_sim->setAnalysisParm))(cc, ft_curckt->ci_defOpt,
+     if ((err = ft_sim->setAnalysisParm (cc, ft_curckt->ci_defOpt,
             ft_sim->analyses[which]->analysisParms[i].id, &pval,
             (IFvalue *)NULL)) != OK)
         ft_sperror(err, "setAnalysisParm(options) ci_curOpt");
@ -551,7 +548,7 @@ if_cktfree(CKTcircuit *ckt, INPtables *tab)
 {
    CKTcircuit *cc = /* fixme, drop that */ ckt;

-    (*(ft_sim->deleteCircuit))(cc);
+    ft_sim->deleteCircuit (cc);
    INPtabEnd(tab);
    return;
 }
@ -587,7 +584,7 @@ finddev_special(
    int err;
    int type = -1;

-    err = (*(ft_sim->findInstance))(ck,&type,devptr,name,NULL,NULL);
+    err = ft_sim->findInstance (ck, &type, devptr, name, NULL, NULL);
    if(err == OK)
    {
     *device_or_model=0;
@ -595,7 +592,7 @@ finddev_special(
    }
    type = -1;
    *devptr = (GENinstance *)NULL;
-    err = (*(ft_sim->findModel))(ck,&type,modptr,name);
+    err = ft_sim->findModel (ck, &type, modptr, name);
    if(err == OK)
    {
     *device_or_model=1;
@ -1080,10 +1077,10 @@ doask(CKTcircuit *ckt, int typecode, GENinstance *dev, GENmodel *mod, IFparm *op
    /* fprintf(cp_err, "Calling doask(%d, %x, %x, %x)\n", 
            typecode, dev, mod, opt); */
    if (dev)
-        err = (*(ft_sim->askInstanceQuest))(ckt, dev, 
+        err = ft_sim->askInstanceQuest (ckt, dev,
                opt->id, &pv, (IFvalue *)NULL);
    else
-        err = (*(ft_sim->askModelQuest))(ckt, mod, 
+        err = ft_sim->askModelQuest (ckt, mod,
                opt->id, &pv, (IFvalue *)NULL);
    if (err != OK) {
        ft_sperror(err, "if_getparam");
@ -1165,10 +1162,10 @@ doset(CKTcircuit *ckt, int typecode, GENinstance *dev, GENmodel *mod, IFparm *op
            typecode, dev, mod, opt); */

    if (dev)
-        err = (*(ft_sim->setInstanceParm))(ckt, dev, 
+        err = ft_sim->setInstanceParm (ckt, dev,
                opt->id, &nval, (IFvalue *)NULL);
    else
-        err = (*(ft_sim->setModelParm))(ckt, mod, 
+        err = ft_sim->setModelParm (ckt, mod,
                opt->id, &nval, (IFvalue *)NULL);

    return err;
@ -1186,11 +1183,11 @@ finddev(CKTcircuit *ck, char *name, GENinstance **devptr, GENmodel **modptr)
    int err;
    int type = -1;

-    err = (*(ft_sim->findInstance))(ck,&type,devptr,name,NULL,NULL);
+    err = ft_sim->findInstance (ck, &type, devptr, name, NULL, NULL);
    if(err == OK) return(type);
    type = -1;
    *devptr = (GENinstance *)NULL;
-    err = (*(ft_sim->findModel))(ck,&type,modptr,name);
+    err = ft_sim->findModel (ck, &type, modptr, name);
    if(err == OK) return(type);
    *modptr = (GENmodel *)NULL;
    return(-1);
@ -1204,7 +1201,7 @@ if_analQbyName(CKTcircuit *ckt, int which, JOB *anal, char *name, IFvalue *parm)
    int i;
    for(i=0;i<ft_sim->analyses[which]->numParms;i++) {
        if(strcmp(ft_sim->analyses[which]->analysisParms[i].keyword,name)==0) {
-            return( (*(ft_sim->askAnalysisQuest))(ckt,anal,
+            return( ft_sim->askAnalysisQuest (ckt, anal,
                    ft_sim->analyses[which]->analysisParms[i].id,parm,
                    (IFvalue *)NULL) );
        }
@ -1238,7 +1235,7 @@ if_tranparams(struct circ *ci, double *start, double *stop, double *step)
    err = IFnewUid(ci->ci_ckt,&tranUid,(IFuid)NULL,"Transient Analysis",
 	UID_ANALYSIS, NULL);
    if(err != OK) return(FALSE);
-    err =(*(ft_sim->findAnalysis))(ci->ci_ckt,&which, &anal,tranUid,
+    err = ft_sim->findAnalysis (ci->ci_ckt, &which, &anal, tranUid,
            ci->ci_curTask,(IFuid )NULL);
    if(err != OK) return(FALSE);
    err = if_analQbyName(ci->ci_ckt,which,anal,"tstart",&tmp);
@ -1282,7 +1279,7 @@ if_getstat(CKTcircuit *ckt, char *name)
                break;
        if (i == ft_sim->analyses[which]->numParms)
            return (NULL);
-        if ((*(ft_sim->askAnalysisQuest))(ckt, &(ft_curckt->ci_curTask->taskOptions),
+        if (ft_sim->askAnalysisQuest (ckt, &(ft_curckt->ci_curTask->taskOptions),
                ft_sim->analyses[which]->analysisParms[i].id, &parm, 
                (IFvalue *)NULL) == -1) {
            fprintf(cp_err, 
@ -1296,7 +1293,7 @@ if_getstat(CKTcircuit *ckt, char *name)
            if(!(ft_sim->analyses[which]->analysisParms[i].dataType&IF_ASK)) {
                continue;
            }
-            if ((*(ft_sim->askAnalysisQuest))(ckt, &(ft_curckt->ci_curTask->taskOptions), 
+            if (ft_sim->askAnalysisQuest (ckt, &(ft_curckt->ci_curTask->taskOptions),
                    ft_sim->analyses[which]->analysisParms[i].id, 
                    &parm, (IFvalue *)NULL) == -1) {
                fprintf(cp_err, 
@ -1556,9 +1553,9 @@ do {\
 	fprintf(cp_err,"error in CKTnames\n");
 	return;
      }
-      (*(SPfrontEnd->IFnewUid))(ckt,&timeUid,(IFuid)NULL,
+      SPfrontEnd->IFnewUid (ckt, &timeUid, (IFuid)NULL,
 				"time", UID_OTHER, NULL);
-      error = (*(SPfrontEnd->OUTpBeginPlot))(ckt,
+      error = SPfrontEnd->OUTpBeginPlot (ckt,
 	     ckt->CKTcurJob,
 	     ckt->CKTcurJob->JOBname,timeUid,IF_REAL,numNames,nameList,
 	     IF_REAL,&(((TRANan*)ckt->CKTcurJob)->TRANplot));
--- a/src/frontend/vectors.c
+++ b/src/frontend/vectors.c
@ -445,8 +445,8 @@ vec_get(const char *vec_name)
              * if_setparam(ft_curckt->ci_ckt, &dev, param, dv, do_model);
              */

-            /* vv = (*if_getparam)(ft_curckt->ci_ckt, &name, param, 0, 0); */
-	    vv = (*if_getparam)(ft_curckt->ci_ckt, &name, param, 0, 0);	
+            /* vv = if_getparam (ft_curckt->ci_ckt, &name, param, 0, 0); */
+	    vv = if_getparam (ft_curckt->ci_ckt, &name, param, 0, 0);
 	    if (!vv) {
 	        tfree(whole);
 		tfree(wd);
--- a/src/frontend/where.c
+++ b/src/frontend/where.c
@ -28,7 +28,7 @@ com_where(wordlist *wl)
       fprintf(cp_err, "No unconverged node found.\n");
 	   return;
 	}
-	msg = (*ft_sim->nonconvErr)(ft_curckt->ci_ckt, 0);
+	msg = ft_sim->nonconvErr (ft_curckt->ci_ckt, 0);

 	printf("%s", msg);

@ -37,7 +37,7 @@ com_where(wordlist *wl)

 /*
 	if (ft_curckt) {
-	    msg = (*ft_sim->nonconvErr)((void *) (ft_curckt->ci_ckt), 0);
+	    msg = ft_sim->nonconvErr (ft_curckt->ci_ckt, 0);
 	    fprintf(cp_out, "%s", msg);
 	} else {
 	    fprintf(cp_err, "Error: no circuit loaded.\n");
--- a/src/maths/ni/niiter.c
+++ b/src/maths/ni/niiter.c
@ -112,11 +112,11 @@ NIiter(CKTcircuit *ckt, int maxIter)
            }

            if(ckt->CKTniState & NISHOULDREORDER) {
-                startTime = (*(SPfrontEnd->IFseconds))();
+                startTime = SPfrontEnd->IFseconds();
                error = SMPreorder(ckt->CKTmatrix,ckt->CKTpivotAbsTol,
                        ckt->CKTpivotRelTol,ckt->CKTdiagGmin);
-                ckt->CKTstat->STATreorderTime += 
-                        (*(SPfrontEnd->IFseconds))()-startTime;
+                ckt->CKTstat->STATreorderTime +=
+                        SPfrontEnd->IFseconds() - startTime;
                if(error) {
                    /* new feature - we can now find out something about what is
                     * wrong - so we ask for the troublesome entry 
@ -126,7 +126,7 @@ NIiter(CKTcircuit *ckt, int maxIter)
                    (void)sprintf(message,
                            "singular matrix:  check nodes %s and %s\n",
                            NODENAME(ckt,i),NODENAME(ckt,j));
-                    (*(SPfrontEnd->IFerror))(ERR_WARNING,message,(IFuid *)NULL);
+                    SPfrontEnd->IFerror (ERR_WARNING, message, (IFuid *)NULL);
                    FREE(message);
                    ckt->CKTstat->STATnumIter += iterno;
 #ifdef STEPDEBUG
@ -137,11 +137,11 @@ NIiter(CKTcircuit *ckt, int maxIter)
                }
                ckt->CKTniState &= ~NISHOULDREORDER;
            } else {
-                startTime = (*(SPfrontEnd->IFseconds))();
+                startTime = SPfrontEnd->IFseconds();
                error=SMPluFac(ckt->CKTmatrix,ckt->CKTpivotAbsTol,
                        ckt->CKTdiagGmin);
-                ckt->CKTstat->STATdecompTime += 
-                        (*(SPfrontEnd->IFseconds))()-startTime;
+                ckt->CKTstat->STATdecompTime +=
+                        SPfrontEnd->IFseconds() - startTime;
                if(error) {
                    if( error == E_SINGULAR ) {
                        ckt->CKTniState |= NISHOULDREORDER;
@ -167,9 +167,9 @@ NIiter(CKTcircuit *ckt, int maxIter)
                *(OldCKTstate0+i) = *(ckt->CKTstate0+i);
            }
            
-            startTime = (*(SPfrontEnd->IFseconds))();
+            startTime = SPfrontEnd->IFseconds();
            SMPsolve(ckt->CKTmatrix,ckt->CKTrhs,ckt->CKTrhsSpare);
-            ckt->CKTstat->STATsolveTime += (*(SPfrontEnd->IFseconds))()-
+            ckt->CKTstat->STATsolveTime += SPfrontEnd->IFseconds() -
                    startTime;
 #ifdef STEPDEBUG
 /*XXXX*/
--- a/src/maths/sparse/spbuild.c
+++ b/src/maths/sparse/spbuild.c
@ -1183,7 +1183,7 @@ spInitialize(MatrixPtr eMatrix, int (*pInit)(RealNumber*, void *InitInfo, int ,
            }
            else
            {
-		Error = (*pInit)((RealNumber *)pElement, pElement->pInitInfo,
+		Error = pInit ((RealNumber *)pElement, pElement->pInitInfo,
                                 Matrix->IntToExtRowMap[pElement->Row], Col);
                if (Error)
                {
--- a/src/misc/hash.c
+++ b/src/misc/hash.c
@ -178,13 +178,13 @@ void nghash_empty(NGHASHPTR hashtable, void (*delete_data) (void *),

 	/* execute user define delete function if requested */
 	if( delete_data ){
-	    (*delete_data)(zapptr->data) ;
+	    delete_data (zapptr->data);
 	}
 	if( hashtable->hash_func == (void *) NGHASH_DEF_HASH_STR ) {
 	  /* we allocated this ourselves we can delete it */
 	  NGFREE( zapptr->key ) ;
 	} else if( delete_key ){
-	  (*delete_key)(zapptr->key) ;
+	  delete_key (zapptr->key);
 	}
 	NGFREE( zapptr ) ;
      }
@ -267,7 +267,7 @@ void * _nghash_find(NGHASHPTR hashtable, void * user_key,BOOL *status)
 	  ret_code = NGHASH_PTR_COMPARE_FUNC( curPtr->key, user_key );
 	} else {
 	  compare_func = (COMPARE_FUNC) hashtable->compare_func ;
-	  ret_code = (*(compare_func))(curPtr->key, user_key ) ;
+	  ret_code = compare_func (curPtr->key, user_key);
 	}
 	if( ret_code == STRINGEQ ){
 	  /* ----------------------------------------------------
@ -319,7 +319,7 @@ void * _nghash_find_again(NGHASHPTR hashtable, void * user_key,BOOL *status)
 	  ret_code = NGHASH_PTR_COMPARE_FUNC( curPtr->key, user_key );
 	} else {
 	  compare_func = (COMPARE_FUNC) hashtable->compare_func ;
-	  ret_code = (*(compare_func))(curPtr->key, user_key ) ;
+	  ret_code = compare_func (curPtr->key, user_key);
 	}
 	if( ret_code == STRINGEQ ){
 	  hashtable->searchPtr = curPtr ;
@ -387,7 +387,7 @@ void * nghash_delete(NGHASHPTR hashtable, void * user_key)
 	  ret_code = NGHASH_PTR_COMPARE_FUNC( curPtr->key, user_key );
 	} else {
 	  compare_func = (COMPARE_FUNC) hashtable->compare_func ;
-	  ret_code = (*(compare_func))(curPtr->key, user_key ) ;
+	  ret_code = compare_func (curPtr->key, user_key);
 	}
 	if( ret_code == STRINGEQ ){
 	  if( curPtr->thread_prev ){ /* no sentinel */
@ -457,10 +457,10 @@ void * nghash_insert(NGHASHPTR hashtable, void * user_key, void * data)
 	  ret_code = strcmp((char *)curPtr->key, (char *) user_key ) ;
 	} else if ( hashtable->compare_func == (void *) NGHASH_DEF_CMP_PTR||
 		   hashtable->compare_func == (void *) NGHASH_DEF_CMP_NUM ){
-	  ret_code = NGHASH_PTR_COMPARE_FUNC( curPtr->key, user_key );
+	  ret_code = NGHASH_PTR_COMPARE_FUNC( curPtr->key, user_key);
 	} else {
 	    compare_func = (COMPARE_FUNC) hashtable->compare_func ;
-	    ret_code = (*(compare_func))(curPtr->key, user_key ) ;
+	    ret_code = compare_func (curPtr->key, user_key);
 	}
 	if( ret_code == STRINGEQ ){
 	  if( hashtable->unique ){
@ -547,10 +547,10 @@ static NGTABLEPTR _nghash_find_item(NGHASHPTR htable,void * user_key,void * data
 	  ret_code = strcmp((char *)curPtr->key, (char *) user_key ) ;
 	} else if ( htable->compare_func == (void *) NGHASH_DEF_CMP_PTR||
 		   htable->compare_func == (void *) NGHASH_DEF_CMP_NUM ){
-	  ret_code = NGHASH_PTR_COMPARE_FUNC( curPtr->key, user_key );
+	  ret_code = NGHASH_PTR_COMPARE_FUNC( curPtr->key, user_key);
 	} else {
 	    compare_func = (COMPARE_FUNC) htable->compare_func ;
-	    ret_code = (*(compare_func))(curPtr->key, user_key ) ;
+	    ret_code = compare_func (curPtr->key, user_key);
 	}
 	if( ret_code == STRINGEQ ){
 	  if( data ){
@ -730,7 +730,7 @@ void nghash_dump(NGHASHPTR htable, void (*print_key) (void *))
 		    fprintf( stderr, " key:%0lx ", (unsigned long) hptr->key ) ;
 		}
 		if( print_key) {
-		    (*print_key)(hptr->data) ;
+		    print_key (hptr->data);
 		} else {
 		    fprintf( stderr, " data:%0lx ", (unsigned long) hptr->data ) ;
 		}
@ -792,7 +792,7 @@ BOOL nghash_deleteItem(NGHASHPTR hashtable, void * user_key, void * data)
 	  ret_code = NGHASH_PTR_COMPARE_FUNC( curPtr->key, user_key );
 	} else {
 	  compare_func = (COMPARE_FUNC) hashtable->compare_func ;
-	  ret_code = (*(compare_func))(curPtr->key, user_key ) ;
+	  ret_code = compare_func (curPtr->key, user_key);
 	}
 	if( ret_code == STRINGEQ ){
 	  if( curPtr->data == data ){
--- a/src/spicelib/analysis/acan.c
+++ b/src/spicelib/analysis/acan.c
@ -129,7 +129,7 @@ ACan(CKTcircuit *ckt, int restart)
         * Moreover the begin plot has not even been done yet at this 
         * point... 
         */
-        (*(SPfrontEnd->OUTpBeginPlot))(ckt, ckt->CKTcurJob,
+        SPfrontEnd->OUTpBeginPlot (ckt, ckt->CKTcurJob,
            ckt->CKTcurJob->JOBname,(IFuid)NULL,IF_REAL,numNames,nameList,
            IF_REAL,&acPlot);
        tfree(nameList);
@ -138,7 +138,7 @@ ACan(CKTcircuit *ckt, int restart)
        CKTdump(ckt,(double)0,acPlot);
        ipc_send_dcop_suffix();

-        (*(SPfrontEnd->OUTendPlot))(acPlot);
+        SPfrontEnd->OUTendPlot (acPlot);
    }
 /* gtri - end - wbk */
 #endif
@ -152,18 +152,18 @@ ACan(CKTcircuit *ckt, int restart)

 	if (ckt->CKTkeepOpInfo) {
 	    /* Dump operating point. */
-	    error = (*(SPfrontEnd->OUTpBeginPlot))(ckt,
+	    error = SPfrontEnd->OUTpBeginPlot (ckt,
 		ckt->CKTcurJob, "AC Operating Point",
 		(IFuid)NULL,IF_REAL,numNames,nameList, IF_REAL,&plot);
 	    if(error) return(error);
 	    CKTdump(ckt,(double)0,plot);
-	    (*(SPfrontEnd->OUTendPlot))(plot);
+	    SPfrontEnd->OUTendPlot (plot);
 	    plot = NULL;
 	}

-        (*(SPfrontEnd->IFnewUid))(ckt,&freqUid,(IFuid)NULL,
+        SPfrontEnd->IFnewUid (ckt, &freqUid, (IFuid)NULL,
                "frequency", UID_OTHER, NULL);
-        error = (*(SPfrontEnd->OUTpBeginPlot))(ckt,
+        error = SPfrontEnd->OUTpBeginPlot (ckt,
 		ckt->CKTcurJob,
                ckt->CKTcurJob->JOBname,freqUid,IF_REAL,numNames,nameList,
                IF_COMPLEX,&acPlot);
@ -171,7 +171,7 @@ ACan(CKTcircuit *ckt, int restart)
 	if(error) return(error);

        if (((ACAN*)ckt->CKTcurJob)->ACstepType != LINEAR) {
-	    (*(SPfrontEnd->OUTattributes))((void *)acPlot,NULL,
+	    SPfrontEnd->OUTattributes (acPlot, NULL,
 		    OUT_SCALE_LOG, NULL);
 	}
        freq = ((ACAN*)ckt->CKTcurJob)->ACstartFreq;
@ -180,7 +180,7 @@ ACan(CKTcircuit *ckt, int restart)
        freq = ((ACAN*)ckt->CKTcurJob)->ACsaveFreq;
        ((ACAN*)ckt->CKTcurJob)->ACsaveFreq = 0; /* clear the 'old' frequency */
 	/* fix resume? saj*/
-	error = (*(SPfrontEnd->OUTpBeginPlot))(ckt,
+	error = SPfrontEnd->OUTpBeginPlot (ckt,
 		ckt->CKTcurJob,
                ckt->CKTcurJob->JOBname,freqUid,IF_REAL,numNames,nameList,
                IF_COMPLEX,&acPlot);
@ -222,7 +222,7 @@ ACan(CKTcircuit *ckt, int restart)

    /* main loop through all scheduled frequencies */
    while(freq <= ((ACAN*)ckt->CKTcurJob)->ACstopFreq+freqTol) {
-        if( (*(SPfrontEnd->IFpauseTest))() ) { 
+        if(SPfrontEnd->IFpauseTest()) {
            /* user asked us to pause via an interrupt */
            ((ACAN*)ckt->CKTcurJob)->ACsaveFreq = freq;
            return(E_PAUSE);
@ -373,7 +373,7 @@ ACan(CKTcircuit *ckt, int restart)

    }
 endsweep:
-    (*(SPfrontEnd->OUTendPlot))(acPlot);
+    SPfrontEnd->OUTendPlot (acPlot);
    acPlot = NULL;
    ckt->CKTcurrentAnalysis = 0;
    ckt->CKTstat->STATacTime += SPfrontEnd->IFseconds() - startTime;
@ -418,8 +418,8 @@ CKTacLoad(CKTcircuit *ckt)
    SMPcClear(ckt->CKTmatrix);

    for (i=0;i<DEVmaxnum;i++) {
-        if ( DEVices[i] && ((*DEVices[i]).DEVacLoad != NULL) && (ckt->CKThead[i] != NULL) ){
-            error = (*((*DEVices[i]).DEVacLoad))(ckt->CKThead[i],ckt);
+        if ( DEVices[i] && DEVices[i]->DEVacLoad && ckt->CKThead[i] ) {
+            error = DEVices[i]->DEVacLoad (ckt->CKThead[i], ckt);
 #ifdef PARALLEL_ARCH
 	    if (error) goto combine;
 #else
--- a/src/spicelib/analysis/cktacdum.c
+++ b/src/spicelib/analysis/cktacdum.c
@ -36,7 +36,7 @@ CKTacDump(CKTcircuit *ckt, double freq, void *plot)
        data[i].real = rhsold[i+1];
        data[i].imag = irhsold[i+1];
    }
-    (*(SPfrontEnd->OUTpData))(plot,&freqData,&valueData);
+    SPfrontEnd->OUTpData (plot, &freqData, &valueData);
    FREE(data);
    return(OK);
 }
--- a/src/spicelib/analysis/cktaskaq.c
+++ b/src/spicelib/analysis/cktaskaq.c
@ -23,5 +23,5 @@ CKTaskAnalQ(CKTcircuit *ckt, JOB *analPtr, int parm, IFvalue *value, IFvalue *se
    NG_IGNORE(selector);

    if((analInfo[type]->askQuest) == NULL) return(E_BADPARM);
-    return( (*(analInfo[type]->askQuest))(ckt,analPtr,parm,value));
+    return( analInfo[type]->askQuest (ckt, analPtr, parm, value));
 }
--- a/src/spicelib/analysis/cktdest.c
+++ b/src/spicelib/analysis/cktdest.c
@ -37,8 +37,8 @@ CKTdestroy(CKTcircuit *inCkt)
 #endif

    for (i=0;i<DEVmaxnum;i++) {
-        if ( DEVices[i] && ((*DEVices[i]).DEVdestroy != NULL) && (ckt->CKThead[i] != NULL) ){
-            (*((*DEVices[i]).DEVdestroy))(&(ckt->CKThead[i]));
+        if ( DEVices[i] && DEVices[i]->DEVdestroy && ckt->CKThead[i] ) {
+            DEVices[i]->DEVdestroy (&(ckt->CKThead[i]));
        }
    }
    for(i=0;i<=ckt->CKTmaxOrder+1;i++){
--- a/src/spicelib/analysis/cktdisto.c
+++ b/src/spicelib/analysis/cktdisto.c
@ -31,8 +31,8 @@ CKTdisto (CKTcircuit *ckt, int mode)
    case D_SETUP:

 	    for (i=0;i<DEVmaxnum;i++) {
-		if ( DEVices[i] && ((*DEVices[i]).DEVdisto != NULL) && (ckt->CKThead[i] != NULL) ){
-		    error = (*((*DEVices[i]).DEVdisto))(mode,ckt->CKThead[i],ckt);
+		if ( DEVices[i] && DEVices[i]->DEVdisto && ckt->CKThead[i] ) {
+		    error = DEVices[i]->DEVdisto (mode, ckt->CKThead[i], ckt);
 		    if(error) return(error);
 		}
 	    }
@ -52,8 +52,8 @@ CKTdisto (CKTcircuit *ckt, int mode)
 	    }

 	    for (i=0;i<DEVmaxnum;i++) {
-		if ( DEVices[i] && ((*DEVices[i]).DEVdisto != NULL) && (ckt->CKThead[i] != NULL) ){
-		    error = (*((*DEVices[i]).DEVdisto))(mode,ckt->CKThead[i],ckt);
+		if ( DEVices[i] && DEVices[i]->DEVdisto && ckt->CKThead[i] ) {
+		    error = DEVices[i]->DEVdisto (mode, ckt->CKThead[i], ckt);
 		    if(error) return(error);
 		}
 	    }
--- a/src/spicelib/analysis/cktdltm.c
+++ b/src/spicelib/analysis/cktdltm.c
@ -34,11 +34,11 @@ CKTdltMod(CKTcircuit *cktp, GENmodel *modPtr)

    for (h = m->GENinstances; h; h = next_i) {
 	    next_i = h->GENnextInstance;
-	    error = (*(SPfrontEnd->IFdelUid))(ckt,h->GENname,
+	    error = SPfrontEnd->IFdelUid (ckt, h->GENname,
 		    UID_INSTANCE);
 	    tfree(h);
    }
-    error = (*(SPfrontEnd->IFdelUid))(ckt,m->GENmodName, UID_MODEL);
+    error = SPfrontEnd->IFdelUid (ckt, m->GENmodName, UID_MODEL);
    tfree(m);
    return(OK);
 }
--- a/src/spicelib/analysis/cktdltn.c
+++ b/src/spicelib/analysis/cktdltn.c
@ -49,7 +49,7 @@ CKTdltNNum(CKTcircuit *cktp, int num)
    if (node == ckt->CKTlastNode)
 	ckt->CKTlastNode = sprev;

-    error = (*(SPfrontEnd->IFdelUid))(ckt,node->name, UID_SIGNAL);
+    error = SPfrontEnd->IFdelUid (ckt, node->name, UID_SIGNAL);
    tfree(node);

    return error;
--- a/src/spicelib/analysis/cktdojob.c
+++ b/src/spicelib/analysis/cktdojob.c
@ -48,7 +48,7 @@ CKTdoJob(CKTcircuit *inCkt, int reset, TSKtask *inTask)

    ANALmaxnum = spice_num_analysis();

-    startTime = (*(SPfrontEnd->IFseconds))( );
+    startTime = SPfrontEnd->IFseconds();

    ckt->CKTtemp  = task->TSKtemp;
    ckt->CKTnomTemp  = task->TSKnomTemp;
@ -119,7 +119,7 @@ CKTdoJob(CKTcircuit *inCkt, int reset, TSKtask *inTask)
 		    senflag = 1;
 		    ckt->CKTcurJob = job;
 		    ckt->CKTsenInfo = (SENstruct *) job;
-		    error = (*(analInfo[sens_num]->an_func))(ckt, reset);
+		    error = analInfo[sens_num]->an_func (ckt, reset);
 		}
 	    }

@ -193,7 +193,7 @@ CKTdoJob(CKTcircuit *inCkt, int reset, TSKtask *inTask)
                ckt->CKTcurJob=job;
 		error = OK;
 		if (analInfo[i]->an_init)
-		    error = (*(analInfo[i]->an_init))(ckt, job);
+		    error = analInfo[i]->an_init (ckt, job);
 		if (!error && analInfo[i]->do_ic)
 		    error = CKTic(ckt);
 		if (!error){
@ -202,12 +202,12 @@ CKTdoJob(CKTcircuit *inCkt, int reset, TSKtask *inTask)
                  error = EVTsetup(ckt);
                  if(error) {
                    ckt->CKTstat->STATtotAnalTime +=
-                      (*(SPfrontEnd->IFseconds))()-startTime;
+                      SPfrontEnd->IFseconds() - startTime;
                    return(error);
                  }
                  /* gtri - end - 6/10/91 - wbk - Setup event-driven data */
 #endif
-		    error = (*(analInfo[i]->an_func))(ckt, reset);
+		    error = analInfo[i]->an_func (ckt, reset);
 			/* txl, cpl addition */
 			if (error == 1111) break;
 		}
@ -217,7 +217,7 @@ CKTdoJob(CKTcircuit *inCkt, int reset, TSKtask *inTask)
 	}
    }

-    ckt->CKTstat->STATtotAnalTime += (*(SPfrontEnd->IFseconds))( ) - startTime;
+    ckt->CKTstat->STATtotAnalTime += SPfrontEnd->IFseconds() - startTime;

 #ifdef WANT_SENSE2
    if (ckt->CKTsenInfo)
--- a/src/spicelib/analysis/cktdump.c
+++ b/src/spicelib/analysis/cktdump.c
@ -41,7 +41,7 @@ CKTdump(CKTcircuit *ckt, double ref, void *plot)
    refData.rValue = ref;
    valData.v.numValue = ckt->CKTmaxEqNum-1;
    valData.v.vec.rVec = ckt->CKTrhsOld+1;
-    (*(SPfrontEnd->OUTpData))(plot,&refData,&valData);
+    SPfrontEnd->OUTpData (plot, &refData, &valData);

 #ifdef CIDER
 /* 
@ -54,9 +54,8 @@ CKTdump(CKTcircuit *ckt, double ref, void *plot)
 */
 
  for (i=0; i<DEVmaxnum; i++) {
-    if ( DEVices[i] && ((*DEVices[i]).DEVdump != NULL) &&
-                (ckt->CKThead[i] != NULL) ){
-                (*((*DEVices[i]).DEVdump))(ckt->CKThead[i],ckt);
+    if ( DEVices[i] && DEVices[i]->DEVdump && ckt->CKThead[i] ) {
+                DEVices[i]->DEVdump (ckt->CKThead[i], ckt);
    }
  }
 /* End cider integration */
@ -87,9 +86,8 @@ NDEVacct(CKTcircuit *ckt, FILE *file)
    }

     for (i=0; i<DEVmaxnum; i++) {
-        if ( DEVices[i] && ((*DEVices[i]).DEVacct != NULL) &&
-                (ckt->CKThead[i] != NULL) ){
-                (*((*DEVices[i]).DEVacct))(ckt->CKThead[i],ckt, file);
+        if ( DEVices[i] && DEVices[i]->DEVacct && ckt->CKThead[i] ) {
+                DEVices[i]->DEVacct (ckt->CKThead[i], ckt, file);
    }
   }
    return;
--- a/src/spicelib/analysis/cktfbran.c
+++ b/src/spicelib/analysis/cktfbran.c
@ -24,8 +24,8 @@ CKTfndBranch(CKTcircuit *ckt, IFuid name)
    int j;

    for (i=0;i<DEVmaxnum;i++) {
-        if ( DEVices[i] && (*DEVices[i]).DEVfindBranch != NULL && ckt->CKThead[i] != NULL ) {
-            j = (*((*DEVices[i]).DEVfindBranch))(ckt,ckt->CKThead[i],name);
+        if ( DEVices[i] && DEVices[i]->DEVfindBranch && ckt->CKThead[i] ) {
+            j = DEVices[i]->DEVfindBranch (ckt, ckt->CKThead[i], name);
            if(j != 0) return(j);
        }
    }
--- a/src/spicelib/analysis/ckti2nod.c
+++ b/src/spicelib/analysis/ckti2nod.c
@ -28,7 +28,7 @@ CKTinst2Node(CKTcircuit *ckt, void *instPtr, int terminal, CKTnode **node, IFuid

    type = ((GENinstance *)instPtr)->GENmodPtr->GENmodType;

-    if(*((*DEVices[type]).DEVpublic.terms) >= terminal && terminal >0 ) {
+    if(*(DEVices[type]->DEVpublic.terms) >= terminal && terminal > 0) {
        switch(terminal) {
            default: return(E_NOTERM);
            case 1:
--- a/src/spicelib/analysis/cktic.c
+++ b/src/spicelib/analysis/cktic.c
@ -42,8 +42,8 @@ CKTic(CKTcircuit *ckt)

    if(ckt->CKTmode & MODEUIC) {
        for (i=0;i<DEVmaxnum;i++) {
-            if( DEVices[i] && ((*DEVices[i]).DEVsetic != NULL) && (ckt->CKThead[i] != NULL) ){
-                error = (*((*DEVices[i]).DEVsetic))(ckt->CKThead[i],ckt);
+            if( DEVices[i] && DEVices[i]->DEVsetic && ckt->CKThead[i] ) {
+                error = DEVices[i]->DEVsetic (ckt->CKThead[i], ckt);
                if(error) return(error);
            }
        }
--- a/src/spicelib/analysis/cktload.c
+++ b/src/spicelib/analysis/cktload.c
@ -52,7 +52,7 @@ CKTload(CKTcircuit *ckt)
    /* gtri - begin - Put resistors to ground at all nodes */
 #endif

-    startTime = (*(SPfrontEnd->IFseconds))();
+    startTime = SPfrontEnd->IFseconds();
    size = SMPmatSize(ckt->CKTmatrix);
    for (i=0;i<=size;i++) {
        *(ckt->CKTrhs+i)=0;
@ -63,14 +63,14 @@ CKTload(CKTcircuit *ckt)
 #endif /* STEPDEBUG */

    for (i=0;i<DEVmaxnum;i++) {
-        if ( DEVices[i] && ((*DEVices[i]).DEVload != NULL) && (ckt->CKThead[i] != NULL) ){
-            error = (*((*DEVices[i]).DEVload))(ckt->CKThead[i],ckt);
+        if ( DEVices[i] && DEVices[i]->DEVload && ckt->CKThead[i] ) {
+            error = DEVices[i]->DEVload (ckt->CKThead[i], ckt);
 	    if (ckt->CKTnoncon)
 		ckt->CKTtroubleNode = 0;
 #ifdef STEPDEBUG
            if(noncon != ckt->CKTnoncon) {
                printf("device type %s nonconvergence\n",
-                        (*DEVices[i]).DEVpublic.name);
+                        DEVices[i]->DEVpublic.name);
                noncon = ckt->CKTnoncon;
            }
 #endif /* STEPDEBUG */
--- a/src/spicelib/analysis/cktmapn.c
+++ b/src/spicelib/analysis/cktmapn.c
@ -35,7 +35,7 @@ CKTmapNode(CKTcircuit *ckt, CKTnode **node, IFuid name)
    /* not found, so must be a new one */
    error = CKTmkNode(ckt,&mynode); /*allocate the node*/
    if(error) return(error);
-    error = (*(SPfrontEnd->IFnewUid))(ckt,
+    error = SPfrontEnd->IFnewUid (ckt,
 				      &uid,
 				      (IFuid) NULL,
 				      name,
--- a/src/spicelib/analysis/cktmask.c
+++ b/src/spicelib/analysis/cktmask.c
@ -22,8 +22,8 @@ CKTmodAsk(CKTcircuit *ckt, GENmodel *modfast, int which, IFvalue *value, IFvalue

    NG_IGNORE(selector);

-    if((*DEVices[type]).DEVmodAsk) {
-        return( (*((*DEVices[type]).DEVmodAsk)) (ckt,
+    if(DEVices[type]->DEVmodAsk) {
+        return( DEVices[type]->DEVmodAsk (ckt,
                modfast, which, value) );
    }
    return(E_BADPARM);
--- a/src/spicelib/analysis/cktmkcur.c
+++ b/src/spicelib/analysis/cktmkcur.c
@ -29,7 +29,7 @@ CKTmkCur(CKTcircuit *ckt, CKTnode **node, IFuid basename, char *suffix)
    error = CKTmkNode(ckt,&mynode);
    if(error) return(error);
    checknode = mynode;
-    error = (*(SPfrontEnd->IFnewUid))(ckt,&uid,basename,
+    error = SPfrontEnd->IFnewUid (ckt, &uid, basename,
            suffix, UID_SIGNAL, &checknode);
    if(error) {
        FREE(mynode);
--- a/src/spicelib/analysis/cktmkvol.c
+++ b/src/spicelib/analysis/cktmkvol.c
@ -27,7 +27,7 @@ CKTmkVolt(CKTcircuit *ckt, CKTnode **node, IFuid basename, char *suffix)
    error = CKTmkNode(ckt,&mynode);
    if(error) return(error);
    checknode = mynode;
-    error = (*(SPfrontEnd->IFnewUid))(ckt,&uid,basename,
+    error = SPfrontEnd->IFnewUid (ckt, &uid, basename,
            suffix, UID_SIGNAL, &checknode);
    if(error) {
        FREE(mynode);
--- a/src/spicelib/analysis/cktmpar.c
+++ b/src/spicelib/analysis/cktmpar.c
@ -23,9 +23,8 @@ CKTmodParam(CKTcircuit *ckt, GENmodel *modfast, int param, IFvalue *val, IFvalue
    NG_IGNORE(ckt);
    NG_IGNORE(selector);

-    if (((*DEVices[type]).DEVmodParam)) {
-        return(((*((*DEVices[type]).DEVmodParam)) (param,val,
-                modfast)));
+    if (DEVices[type]->DEVmodParam) {
+        return(DEVices[type]->DEVmodParam (param, val, modfast));
    } else {
        return(E_BADPARM);
    }
--- a/src/spicelib/analysis/cktnoise.c
+++ b/src/spicelib/analysis/cktnoise.c
@ -34,8 +34,8 @@ CKTnoise (CKTcircuit *ckt, int mode, int operation, Ndata *data)
    /* let each device decide how many and what type of noise sources it has */

    for (i=0; i < DEVmaxnum; i++) {
-	if ( DEVices[i] && ((*DEVices[i]).DEVnoise != NULL) && (ckt->CKThead[i] != NULL) ) {
-	    error = (*((*DEVices[i]).DEVnoise))(mode,operation,ckt->CKThead[i],
+	if ( DEVices[i] && DEVices[i]->DEVnoise && ckt->CKThead[i] ) {
+	    error = DEVices[i]->DEVnoise (mode, operation, ckt->CKThead[i],
 		ckt,data, &outNdens);
            if (error) return (error);
        }
@ -53,12 +53,12 @@ CKTnoise (CKTcircuit *ckt, int mode, int operation, Ndata *data)

 	    data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1);

-	    (*(SPfrontEnd->IFnewUid))(ckt, &(data->namelist[data->numPlots++]),
+	    SPfrontEnd->IFnewUid (ckt, &(data->namelist[data->numPlots++]),
 		    (IFuid)NULL, "onoise_spectrum", UID_OTHER, NULL);

 	    data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1);

-	    (*(SPfrontEnd->IFnewUid))(ckt, &(data->namelist[data->numPlots++]),
+	    SPfrontEnd->IFnewUid (ckt, &(data->namelist[data->numPlots++]),
 		    (IFuid)NULL, "inoise_spectrum", UID_OTHER, NULL);

 	    /* we've added two more plots */
@ -70,11 +70,11 @@ CKTnoise (CKTcircuit *ckt, int mode, int operation, Ndata *data)
 	case INT_NOIZ:

 	    data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1);
-	    (*(SPfrontEnd->IFnewUid))(ckt, &(data->namelist[data->numPlots++]),
+	    SPfrontEnd->IFnewUid (ckt, &(data->namelist[data->numPlots++]),
 		(IFuid)NULL, "onoise_total", UID_OTHER, NULL);

 	    data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1);
-	    (*(SPfrontEnd->IFnewUid))(ckt, &(data->namelist[data->numPlots++]),
+	    SPfrontEnd->IFnewUid (ckt, &(data->namelist[data->numPlots++]),
 		(IFuid)NULL, "inoise_total", UID_OTHER, NULL);
 	    /* we've added two more plots */

@ -103,7 +103,7 @@ CKTnoise (CKTcircuit *ckt, int mode, int operation, Ndata *data)
 		refVal.rValue = data->freq; /* the reference is the freq */
 		outData.v.numValue = data->outNumber; /* vector number */
 		outData.v.vec.rVec = data->outpVector; /* vector of outputs */
-		(*(SPfrontEnd->OUTpData))(data->NplotPtr,&refVal,&outData);
+		SPfrontEnd->OUTpData (data->NplotPtr, &refVal, &outData);
            }
            break;

@ -112,7 +112,7 @@ CKTnoise (CKTcircuit *ckt, int mode, int operation, Ndata *data)
 	    data->outpVector[data->outNumber++] =  data->inNoise;
 	    outData.v.vec.rVec = data->outpVector; /* vector of outputs */
 	    outData.v.numValue = data->outNumber; /* vector number */
-	    (*(SPfrontEnd->OUTpData))(data->NplotPtr,&refVal,&outData);
+	    SPfrontEnd->OUTpData (data->NplotPtr, &refVal, &outData);
 	    break;

 	default:
@ -121,7 +121,7 @@ CKTnoise (CKTcircuit *ckt, int mode, int operation, Ndata *data)
        break;

    case N_CLOSE:
-	(*(SPfrontEnd->OUTendPlot))(data->NplotPtr);
+	SPfrontEnd->OUTendPlot (data->NplotPtr);
 	FREE(data->namelist);
 	FREE(data->outpVector);
        break;
--- a/src/spicelib/analysis/cktop.c
+++ b/src/spicelib/analysis/cktop.c
@ -102,9 +102,9 @@ CKTconvTest (CKTcircuit * ckt)

  for (i = 0; i < DEVmaxnum; i++)
    {
-      if (DEVices[i] && ((*DEVices[i]).DEVconvTest != NULL) && (ckt->CKThead[i] != NULL))
+      if (DEVices[i] && DEVices[i]->DEVconvTest && ckt->CKThead[i])
 	{
-	  error = (*((*DEVices[i]).DEVconvTest)) (ckt->CKThead[i], ckt);
+	  error = DEVices[i]->DEVconvTest (ckt->CKThead[i], ckt);
 	}
 #ifdef PARALLEL_ARCH
      if (error || ckt->CKTnoncon)
@ -115,7 +115,7 @@ CKTconvTest (CKTcircuit * ckt)
      if (ckt->CKTnoncon)
 	{
 	  /* printf("convTest: device %s failed\n",
-	   * (*DEVices[i]).DEVpublic.name); */
+	   * DEVices[i]->DEVpublic.name); */
 	  return (OK);
 	}
 #endif /* PARALLEL_ARCH */
@ -162,7 +162,7 @@ dynamic_gmin (CKTcircuit * ckt, long int firstmode,
  CKTnode *n;

  ckt->CKTmode = firstmode;
-  (*(SPfrontEnd->IFerror)) (ERR_INFO,
+  SPfrontEnd->IFerror (ERR_INFO,
 			    "Starting dynamic gmin stepping", (IFuid *) NULL);

  NumNodes = 0;
@ -195,7 +195,7 @@ dynamic_gmin (CKTcircuit * ckt, long int firstmode,

      if (converged == 0){
 		ckt->CKTmode = continuemode;
-		(*(SPfrontEnd->IFerror)) (ERR_INFO,
+		SPfrontEnd->IFerror (ERR_INFO,
 			  "One successful gmin step", (IFuid *) NULL);

 		if (ckt->CKTdiagGmin <= gtarget){
@ -232,11 +232,11 @@ dynamic_gmin (CKTcircuit * ckt, long int firstmode,
 	} else {
 		if (factor < 1.00005){
 			failed = 1;
-			(*(SPfrontEnd->IFerror)) (ERR_WARNING,
+			SPfrontEnd->IFerror (ERR_WARNING,
 					"Last gmin step failed",
 					(IFuid *) NULL);
 		} else {
-			(*(SPfrontEnd->IFerror)) (ERR_WARNING,
+			SPfrontEnd->IFerror (ERR_WARNING,
 					"Further gmin increment",
 					(IFuid *) NULL);
 			factor = sqrt (sqrt (factor));
@ -271,11 +271,11 @@ dynamic_gmin (CKTcircuit * ckt, long int firstmode,
  converged = NIiter (ckt, iterlim);

  if (converged != 0){
-      (*(SPfrontEnd->IFerror)) (ERR_WARNING,
+      SPfrontEnd->IFerror (ERR_WARNING,
 				"Dynamic gmin stepping failed",
 				(IFuid *) NULL);
    } else {
-      (*(SPfrontEnd->IFerror)) (ERR_INFO,
+      SPfrontEnd->IFerror (ERR_INFO,
 				"Dynamic gmin stepping completed",
 				(IFuid *) NULL);
 #ifdef XSPICE
@ -309,7 +309,7 @@ spice3_gmin (CKTcircuit * ckt, long int firstmode,
  int converged, i;

  ckt->CKTmode = firstmode;
-  (*(SPfrontEnd->IFerror)) (ERR_INFO,
+  SPfrontEnd->IFerror (ERR_INFO,
 			    "Starting gmin stepping", (IFuid *) NULL);

  if (ckt->CKTgshunt == 0)
@ -328,7 +328,7 @@ spice3_gmin (CKTcircuit * ckt, long int firstmode,

      if (converged != 0){
 		  ckt->CKTdiagGmin = ckt->CKTgshunt;
-		  (*(SPfrontEnd->IFerror)) (ERR_WARNING,
+		  SPfrontEnd->IFerror (ERR_WARNING,
 				    "gmin step failed", (IFuid *) NULL);
 		  break;
      }
@ -336,7 +336,7 @@ spice3_gmin (CKTcircuit * ckt, long int firstmode,
      ckt->CKTdiagGmin /= ckt->CKTgminFactor;
      ckt->CKTmode = continuemode;

-      (*(SPfrontEnd->IFerror)) (ERR_INFO,
+      SPfrontEnd->IFerror (ERR_INFO,
 				"One successful gmin step", (IFuid *) NULL);
  }

@ -354,7 +354,7 @@ spice3_gmin (CKTcircuit * ckt, long int firstmode,
  converged = NIiter (ckt, iterlim);

  if (converged == 0){
-      (*(SPfrontEnd->IFerror)) (ERR_INFO,
+      SPfrontEnd->IFerror (ERR_INFO,
 		"gmin stepping completed", (IFuid *) NULL);

 #ifdef XSPICE
@ -364,7 +364,7 @@ spice3_gmin (CKTcircuit * ckt, long int firstmode,
 #endif

    } else {
-      (*(SPfrontEnd->IFerror)) (ERR_WARNING,
+      SPfrontEnd->IFerror (ERR_WARNING,
 				"gmin stepping failed", (IFuid *) NULL);
    }

@ -396,7 +396,7 @@ gillespie_src (CKTcircuit * ckt, long int firstmode,
  NG_IGNORE(iterlim);

  ckt->CKTmode = firstmode;
-  (*(SPfrontEnd->IFerror)) (ERR_INFO,
+  SPfrontEnd->IFerror (ERR_INFO,
 			    "Starting source stepping", (IFuid *) NULL);

  ckt->CKTsrcFact = 0;
@ -450,7 +450,7 @@ gillespie_src (CKTcircuit * ckt, long int firstmode,

 	  if (converged != 0){
 	      ckt->CKTdiagGmin = ckt->CKTgshunt;
-	      (*(SPfrontEnd->IFerror)) (ERR_WARNING,
+	      SPfrontEnd->IFerror (ERR_WARNING,
 					"gmin step failed", (IFuid *) NULL);
 		#ifdef XSPICE
 /* gtri - begin - wbk - add convergence problem reporting flags */
@ -462,7 +462,7 @@ gillespie_src (CKTcircuit * ckt, long int firstmode,

 	  ckt->CKTdiagGmin /= 10;
 	  ckt->CKTmode = continuemode;
-	  (*(SPfrontEnd->IFerror)) (ERR_INFO,
+	  SPfrontEnd->IFerror (ERR_INFO,
 				    "One successful gmin step",
 				    (IFuid *) NULL);
      }
@ -482,7 +482,7 @@ gillespie_src (CKTcircuit * ckt, long int firstmode,
 		*(OldCKTstate0 + i) = *(ckt->CKTstate0 + i);
 	

-      (*(SPfrontEnd->IFerror)) (ERR_INFO,
+      SPfrontEnd->IFerror (ERR_INFO,
 				"One successful source step", (IFuid *) NULL);
      ckt->CKTsrcFact = ConvFact + raise;	
  }
@ -518,7 +518,7 @@ gillespie_src (CKTcircuit * ckt, long int firstmode,
 	    for (i = 0; i < ckt->CKTnumStates; i++)
 			*(OldCKTstate0 + i) = *(ckt->CKTstate0 + i);

-	    (*(SPfrontEnd->IFerror)) (ERR_INFO,
+	    SPfrontEnd->IFerror (ERR_INFO,
 				      "One successful source step",
 				      (IFuid *) NULL);

@ -571,13 +571,13 @@ gillespie_src (CKTcircuit * ckt, long int firstmode,
    {
      ckt->CKTsrcFact = 1;
      ckt->CKTcurrentAnalysis = DOING_TRAN;
-      (*(SPfrontEnd->IFerror)) (ERR_WARNING,
+      SPfrontEnd->IFerror (ERR_WARNING,
 				"source stepping failed", (IFuid *) NULL);
      return (E_ITERLIM);
    }
  else
    {
-      (*(SPfrontEnd->IFerror)) (ERR_INFO,
+      SPfrontEnd->IFerror (ERR_INFO,
 				"Source stepping completed", (IFuid *) NULL);
      return (0);
    }
@ -604,7 +604,7 @@ spice3_src (CKTcircuit * ckt, long int firstmode,
  NG_IGNORE(iterlim);

  ckt->CKTmode = firstmode;
-  (*(SPfrontEnd->IFerror)) (ERR_INFO,
+  SPfrontEnd->IFerror (ERR_INFO,
 			    "Starting source stepping", (IFuid *) NULL);

  for (i = 0; i <= ckt->CKTnumSrcSteps; i++)
@ -621,7 +621,7 @@ spice3_src (CKTcircuit * ckt, long int firstmode,
 	{
 	  ckt->CKTsrcFact = 1;
 	  ckt->CKTcurrentAnalysis = DOING_TRAN;
-	  (*(SPfrontEnd->IFerror)) (ERR_WARNING,
+	  SPfrontEnd->IFerror (ERR_WARNING,
 				    "source stepping failed", (IFuid *) NULL);
 #ifdef XSPICE
 /* gtri - begin - wbk - add convergence problem reporting flags */
@ -630,10 +630,10 @@ spice3_src (CKTcircuit * ckt, long int firstmode,
 #endif
 	  return (converged);
 	}
-      (*(SPfrontEnd->IFerror)) (ERR_INFO,
+      SPfrontEnd->IFerror (ERR_INFO,
 				"One successful source step", (IFuid *) NULL);
    }
-  (*(SPfrontEnd->IFerror)) (ERR_INFO,
+  SPfrontEnd->IFerror (ERR_INFO,
 			    "Source stepping completed", (IFuid *) NULL);
  ckt->CKTsrcFact = 1;
 #ifdef XSPICE
--- a/src/spicelib/analysis/cktparam.c
+++ b/src/spicelib/analysis/cktparam.c
@ -24,8 +24,8 @@ CKTparam(CKTcircuit *ckt, GENinstance *fast, int param, IFvalue *val, IFvalue *s
    NG_IGNORE(ckt);

    type = myfast->GENmodPtr->GENmodType;
-    if(((*DEVices[type]).DEVparam)) {
-        return(((*((*DEVices[type]).DEVparam)) (param,val,myfast,selector)));
+    if(DEVices[type]->DEVparam) {
+        return(DEVices[type]->DEVparam (param, val, myfast, selector));
    } else {
        return(E_BADPARM);
    }
--- a/src/spicelib/analysis/cktpmnam.c
+++ b/src/spicelib/analysis/cktpmnam.c
@ -33,16 +33,16 @@ CKTpModName(char *parm, IFvalue *val, CKTcircuit *ckt, int type, IFuid name, GEN

    NG_IGNORE(name);

-    for(i=0;i<(*(*DEVices[type]).DEVpublic.numModelParms);i++) {
-        if(strcmp(parm,((*DEVices[type]).DEVpublic.modelParms[i].keyword))==0){
+    for(i = 0 ; i < *(DEVices[type]->DEVpublic.numModelParms) ; i++) {
+        if(!strcmp(parm, DEVices[type]->DEVpublic.modelParms[i].keyword)) {
            error = CKTmodParam(ckt, *modfast,
-                    (*DEVices[type]).DEVpublic.modelParms[i].id,val,
+                    DEVices[type]->DEVpublic.modelParms[i].id, val,
                    (IFvalue*)NULL);
            if(error) return(error);
            break;
        }
    }
-    if(i==(*(*DEVices[type]).DEVpublic.numModelParms)) {
+    if(i == *(DEVices[type]->DEVpublic.numModelParms)) {
        return(E_BADPARM);
    }
    return(OK);
--- a/src/spicelib/analysis/cktpname.c
+++ b/src/spicelib/analysis/cktpname.c
@ -35,17 +35,16 @@ CKTpName(char *parm, IFvalue *val, CKTcircuit *ckt, int dev, char *name, GENinst

    NG_IGNORE(name);

-    for(i=0;i<(*(*DEVices[dev]).DEVpublic.numInstanceParms);i++) {
-        if(strcmp(parm,
-                ((*DEVices[dev]).DEVpublic.instanceParms[i].keyword))==0) {
+    for(i = 0 ; i < *(DEVices[dev]->DEVpublic.numInstanceParms) ; i++) {
+        if(!strcmp(parm, DEVices[dev]->DEVpublic.instanceParms[i].keyword)) {
            error = CKTparam(ckt, *fast,
-                    (*DEVices[dev]).DEVpublic.instanceParms[i].id,val,
+                    DEVices[dev]->DEVpublic.instanceParms[i].id, val,
                    (IFvalue *)NULL);
            if(error) return(error);
            break;
        }
    }
-    if(i==(*(*DEVices[dev]).DEVpublic.numInstanceParms)) {
+    if(i == *(DEVices[dev]->DEVpublic.numInstanceParms)) {
        return(E_BADPARM);
    }
    return(OK);
--- a/src/spicelib/analysis/cktpzld.c
+++ b/src/spicelib/analysis/cktpzld.c
@ -29,7 +29,7 @@ CKTpzLoad(CKTcircuit *ckt, SPcomplex *s)
    SMPcClear(ckt->CKTmatrix);
    for (i = 0; i < DEVmaxnum; i++) {
        if (DEVices[i] && DEVices[i]->DEVpzLoad != NULL && ckt->CKThead[i] != NULL) {
-            error = (*DEVices[i]->DEVpzLoad)(ckt->CKThead[i], ckt, s);
+            error = DEVices[i]->DEVpzLoad (ckt->CKThead[i], ckt, s);
 #ifdef PARALLEL_ARCH
 	    if (error) goto combine;
 #else
--- a/src/spicelib/analysis/cktpzset.c
+++ b/src/spicelib/analysis/cktpzset.c
@ -35,7 +35,7 @@ CKTpzSetup(CKTcircuit *ckt, int type)

    for (i = 0; i < DEVmaxnum; i++) {
        if (DEVices[i] && DEVices[i]->DEVpzSetup != NULL && ckt->CKThead[i] != NULL) {
-            error = (*DEVices[i]->DEVpzSetup)(matrix, ckt->CKThead[i],
+            error = DEVices[i]->DEVpzSetup (matrix, ckt->CKThead[i],
 		ckt, &ckt->CKTnumStates);
            if (error != OK)
 	        return(error);
--- a/src/spicelib/analysis/cktpzstr.c
+++ b/src/spicelib/analysis/cktpzstr.c
@ -183,11 +183,11 @@ CKTpzFindZeros(CKTcircuit *ckt, PZtrial **rootinfo, int *rootcount)
 	    CKTpzUpdateSet(neighborhood, new_trial);	/* Replace a value */
 	}

-	if ((*(SPfrontEnd->IFpauseTest))( )) {
+	if (SPfrontEnd->IFpauseTest()) {
 	    sprintf(ebuf,
 		"Pole-Zero analysis interrupted; %d trials, %d roots\n",
 		Seq_Num, NZeros); 
-	    (*(SPfrontEnd->IFerror))(ERR_WARNING, ebuf, 0);
+	    SPfrontEnd->IFerror (ERR_WARNING, ebuf, 0);
 	    error = E_PAUSE;
 	    break;
 	}
@ -221,14 +221,14 @@ CKTpzFindZeros(CKTcircuit *ckt, PZtrial **rootinfo, int *rootcount)
 	sprintf(ebuf,
    "Pole-zero converging to numerical aberrations; giving up after %d trials",
 	    Seq_Num);
-	(*(SPfrontEnd->IFerror))(ERR_WARNING, ebuf, 0);
+	SPfrontEnd->IFerror (ERR_WARNING, ebuf, 0);
    }

    if (NIter >= NITER_LIM) {
 	sprintf(ebuf,
 	    "Pole-zero iteration limit reached; giving up after %d trials",
 	    Seq_Num);
-	(*(SPfrontEnd->IFerror))(ERR_WARNING, ebuf, 0);
+	SPfrontEnd->IFerror (ERR_WARNING, ebuf, 0);
    }

    return error;
--- a/src/spicelib/analysis/cktsens.c
+++ b/src/spicelib/analysis/cktsens.c
@ -179,7 +179,7 @@ int sens_sens(CKTcircuit *ckt, int restart)
 					sg->ptable[sg->param].keyword);
 			}

-			(*SPfrontEnd->IFnewUid)(ckt,
+			SPfrontEnd->IFnewUid (ckt,
 				output_names + k, NULL,
 				namebuf, UID_OTHER, NULL);
 			k += 1;
@ -190,12 +190,12 @@ int sens_sens(CKTcircuit *ckt, int restart)
 			freq_name = NULL;
 		} else {
 			type = IF_COMPLEX;
-			(*SPfrontEnd->IFnewUid)(ckt,
+			SPfrontEnd->IFnewUid (ckt,
 				&freq_name, NULL,
 				"frequency", UID_OTHER, NULL);
 		}

-		error = (*SPfrontEnd->OUTpBeginPlot)(ckt,
+		error = SPfrontEnd->OUTpBeginPlot (ckt,
 			ckt->CKTcurJob,
 			ckt->CKTcurJob->JOBname, freq_name, IF_REAL, num_vars,
 			output_names, type, (void **) &sen_data);
@ -210,7 +210,7 @@ int sens_sens(CKTcircuit *ckt, int restart)
 			output_values = NULL;
 			output_cvalues = NEWN(IFcomplex, num_vars);
 			if (sen_info->step_type != SENS_LINEAR)
-			    (*(SPfrontEnd->OUTattributes))((void *)sen_data,
+			    SPfrontEnd->OUTattributes (sen_data,
 				    NULL, OUT_SCALE_LOG, NULL);

 		}
@ -256,7 +256,7 @@ int sens_sens(CKTcircuit *ckt, int restart)

 		n = 0;

-		if ((*SPfrontEnd->IFpauseTest)( )) {
+		if (SPfrontEnd->IFpauseTest()) {
 			/* XXX Save State */
 			return E_PAUSE;
 		}
@ -363,7 +363,7 @@ int sens_sens(CKTcircuit *ckt, int restart)

 			fn = DEVices[sg->dev]->DEVsetup;
 			if (fn)
-				(*fn)(delta_Y, sg->model, ckt,
+				fn (delta_Y, sg->model, ckt,
 					/* XXXX insert old state base here ?? */
 					&ckt->CKTnumStates);

@ -578,14 +578,14 @@ int sens_sens(CKTcircuit *ckt, int restart)
 			nvalue.v.vec.cVec = output_cvalues;

 		value.rValue = freq;
-		
-		(*(SPfrontEnd->OUTpData))(sen_data, &value, &nvalue);
+
+		SPfrontEnd->OUTpData (sen_data, &value, &nvalue);

 		freq = inc_freq(freq, sen_info->step_type, step_size);

 	}

-	(*SPfrontEnd->OUTendPlot)((void *) sen_data);
+	SPfrontEnd->OUTendPlot (sen_data);

 	if (is_dc) {
 		FREE(output_values);	/* XXX free various vectors */
@ -711,7 +711,7 @@ sens_load(sgen *sg, CKTcircuit *ckt, int is_dc)
 		fn = DEVices[sg->dev]->DEVload;

 	if (fn)
-		error = (*fn)(sg->model, ckt);
+		error = fn (sg->model, ckt);
 	else
 		return 1;

@ -729,7 +729,7 @@ sens_temp(sgen *sg, CKTcircuit *ckt)
 	fn = DEVices[sg->dev]->DEVtemperature;

 	if (fn)
-		error = (*fn)(sg->model, ckt);
+		error = fn (sg->model, ckt);
 	else
 		return 1;

@ -751,7 +751,7 @@ sens_getp(sgen *sg, CKTcircuit *ckt, IFvalue *val)
 		fn = DEVices[sg->dev]->DEVask;
 		pid = DEVices[sg->dev]->DEVpublic.instanceParms[sg->param].id;
 		if (fn)
-			error = (*fn)(ckt, sg->instance, pid, val, NULL);
+			error = fn (ckt, sg->instance, pid, val, NULL);
 		else
 			return 1;
 	} else {
@ -759,7 +759,7 @@ sens_getp(sgen *sg, CKTcircuit *ckt, IFvalue *val)
 		fn = DEVices[sg->dev]->DEVmodAsk;
 		pid = DEVices[sg->dev]->DEVpublic.modelParms[sg->param].id;
 		if (fn)
-			error = (*fn)(ckt, sg->model, pid, val);
+			error = fn (ckt, sg->model, pid, val);
 		else
 			return 1;
 	}
@ -797,7 +797,7 @@ sens_setp(sgen *sg, CKTcircuit *ckt, IFvalue *val)
 		fn = DEVices[sg->dev]->DEVparam;
 		pid = DEVices[sg->dev]->DEVpublic.instanceParms[sg->param].id;
 		if (fn)
-			error = (*fn)(pid, val, sg->instance, NULL);
+			error = fn (pid, val, sg->instance, NULL);
 		else
 			return 1;
 	} else {
@ -805,7 +805,7 @@ sens_setp(sgen *sg, CKTcircuit *ckt, IFvalue *val)
 		fn = DEVices[sg->dev]->DEVmodParam;
 		pid = DEVices[sg->dev]->DEVpublic.modelParms[sg->param].id;
 		if (fn)
-			error = (*fn)(pid, val, sg->model);
+			error = fn (pid, val, sg->model);
 		else
 			return 1;
 	}
--- a/src/spicelib/analysis/cktsetap.c
+++ b/src/spicelib/analysis/cktsetap.c
@ -23,5 +23,5 @@ CKTsetAnalPm(CKTcircuit *ckt, JOB *analPtr, int parm, IFvalue *value, IFvalue *s
    NG_IGNORE(selector);

    if((analInfo[type]->setParm)==NULL) return(E_BADPARM);
-    return( (*(analInfo[type]->setParm))(ckt,analPtr,parm,value) );
+    return( analInfo[type]->setParm (ckt, analPtr, parm, value) );
 }
--- a/src/spicelib/analysis/cktsetbk.c
+++ b/src/spicelib/analysis/cktsetbk.c
@ -28,7 +28,7 @@ CKTsetBreak(CKTcircuit *ckt, double time)
 #endif

    if(ckt->CKTtime > time) {
-        (*(SPfrontEnd->IFerror))(ERR_PANIC,"breakpoint in the past - HELP!",
+        SPfrontEnd->IFerror (ERR_PANIC, "breakpoint in the past - HELP!",
                (IFuid *)NULL);
        return(E_INTERN);
    }
--- a/src/spicelib/analysis/cktsetup.c
+++ b/src/spicelib/analysis/cktsetup.c
@ -62,8 +62,8 @@ CKTsetup(CKTcircuit *ckt)
 #ifdef HAS_WINDOWS
        SetAnalyse( "Device Setup", 0 );
 #endif
-        if ( DEVices[i] && ((*DEVices[i]).DEVsetup != NULL) && (ckt->CKThead[i] != NULL) ){
-            error = (*((*DEVices[i]).DEVsetup))(matrix,ckt->CKThead[i],ckt,
+        if ( DEVices[i] && DEVices[i]->DEVsetup && ckt->CKThead[i] ) {
+            error = DEVices[i]->DEVsetup (matrix, ckt->CKThead[i], ckt,
                    &ckt->CKTnumStates);
            if(error) return(error);
        }
@ -141,8 +141,8 @@ CKTunsetup(CKTcircuit *ckt)
    }

    for (i=0;i<DEVmaxnum;i++) {
-        if ( DEVices[i] && ((*DEVices[i]).DEVunsetup != NULL) && (ckt->CKThead[i] != NULL) ){
-            e2 = (*((*DEVices[i]).DEVunsetup))(ckt->CKThead[i],ckt);
+        if ( DEVices[i] && DEVices[i]->DEVunsetup && ckt->CKThead[i] ) {
+            e2 = DEVices[i]->DEVunsetup (ckt->CKThead[i], ckt);
            if (!error && e2)
                error = e2;
        }
--- a/src/spicelib/analysis/ckttemp.c
+++ b/src/spicelib/analysis/ckttemp.c
@ -26,9 +26,8 @@ CKTtemp(CKTcircuit *ckt)
    ckt->CKTvt = CONSTKoverQ * ckt->CKTtemp;

    for (i=0;i<DEVmaxnum;i++) {
-        if ( DEVices[i] && ((*DEVices[i]).DEVtemperature != NULL) &&
-                (ckt->CKThead[i] != NULL) ){
-            error = (*((*DEVices[i]).DEVtemperature))(ckt->CKThead[i],ckt);
+        if ( DEVices[i] && DEVices[i]->DEVtemperature && ckt->CKThead[i] ) {
+            error = DEVices[i]->DEVtemperature (ckt->CKThead[i], ckt);
            if(error) return(error);
        }
    }
--- a/src/spicelib/analysis/ckttrunc.c
+++ b/src/spicelib/analysis/ckttrunc.c
@ -35,11 +35,11 @@ CKTtrunc(CKTcircuit *ckt, double *timeStep)

    timetemp = HUGE;
    for (i=0;i<DEVmaxnum;i++) {
-        if (DEVices[i] && (*DEVices[i]).DEVtrunc != NULL && ckt->CKThead[i] != NULL) {
+        if (DEVices[i] && DEVices[i]->DEVtrunc && ckt->CKThead[i]) {
 #ifdef STEPDEBUG
            debugtemp = timetemp;
 #endif /* STEPDEBUG */
-	    error = (*((*DEVices[i]).DEVtrunc))(ckt->CKThead[i],ckt,&timetemp);
+	    error = DEVices[i]->DEVtrunc (ckt->CKThead[i], ckt, &timetemp);
 	    if(error) {
                ckt->CKTstat->STATtranTruncTime += SPfrontEnd->IFseconds()
                    - startTime;
@ -48,7 +48,7 @@ CKTtrunc(CKTcircuit *ckt, double *timeStep)
 #ifdef STEPDEBUG
            if(debugtemp != timetemp) {
                printf("timestep cut by device type %s from %g to %g\n",
-                        (*DEVices[i]).DEVpublic.name, debugtemp,timetemp);
+                        DEVices[i]->DEVpublic.name, debugtemp, timetemp);
            }
 #endif /* STEPDEBUG */
        }
@ -71,7 +71,7 @@ CKTtrunc(CKTcircuit *ckt, double *timeStep)
    double startTime;
    int size;

-    startTime = (*(SPfrontEnd->IFseconds))();
+    startTime = SPfrontEnd->IFseconds();

    timetemp = HUGE;
    size = SMPmatSize(ckt->CKTmatrix);
--- a/src/spicelib/analysis/ckttyplk.c
+++ b/src/spicelib/analysis/ckttyplk.c
@ -18,7 +18,7 @@ CKTtypelook(char *type)

    int i;
    for(i=0;i<DEVmaxnum;i++) {
-        if(DEVices[i] && strcmp(type,(*DEVices[i]).DEVpublic.name)==0) {
+        if(DEVices[i] && !strcmp(type, DEVices[i]->DEVpublic.name)) {
            /*found the device - return it */
            return(i);
        }
--- a/src/spicelib/analysis/dcop.c
+++ b/src/spicelib/analysis/dcop.c
@ -45,7 +45,7 @@ DCop(CKTcircuit *ckt, int notused)

    error = CKTnames(ckt,&numNames,&nameList);
    if(error) return(error);
-    error = (*(SPfrontEnd->OUTpBeginPlot))(ckt,
+    error = SPfrontEnd->OUTpBeginPlot (ckt,
 	ckt->CKTcurJob, ckt->CKTcurJob->JOBname,
 	(IFuid)NULL,IF_REAL,numNames,nameList, IF_REAL,&plot);
    tfree(nameList); /* va: nameList not used any longer, it was a memory leak */
@ -108,7 +108,7 @@ DCop(CKTcircuit *ckt, int notused)
             i++;
           }
           fprintf(stdout,"\n");
-	   (*(SPfrontEnd->OUTendPlot))(plot); */
+	   SPfrontEnd->OUTendPlot (plot); */
 	   
 	   return(converged);
 	 }
@ -157,6 +157,6 @@ DCop(CKTcircuit *ckt, int notused)
           fprintf(stderr,"error: circuit reload failed.\n");
         }
 #endif
-    (*(SPfrontEnd->OUTendPlot))(plot);
+    SPfrontEnd->OUTendPlot (plot);
    return(converged);
 }
--- a/src/spicelib/analysis/dctran.c
+++ b/src/spicelib/analysis/dctran.c
@ -142,9 +142,9 @@ DCtran(CKTcircuit *ckt,
 #endif
        error = CKTnames(ckt,&numNames,&nameList);
        if(error) return(error);
-        (*(SPfrontEnd->IFnewUid))(ckt,&timeUid,(IFuid)NULL,
+        SPfrontEnd->IFnewUid (ckt, &timeUid, (IFuid)NULL,
                "time", UID_OTHER, NULL);
-        error = (*(SPfrontEnd->OUTpBeginPlot))(ckt,
+        error = SPfrontEnd->OUTpBeginPlot (ckt,
        ckt->CKTcurJob,
        ckt->CKTcurJob->JOBname,timeUid,IF_REAL,numNames,nameList,
        IF_REAL,&(((TRANan*)ckt->CKTcurJob)->TRANplot));
@ -322,7 +322,7 @@ DCtran(CKTcircuit *ckt,
        }
 #endif

-        startTime=(*(SPfrontEnd->IFseconds))();
+        startTime = SPfrontEnd->IFseconds();
        startIters = ckt->CKTstat->STATnumIter;
        startdTime = ckt->CKTstat->STATdecompTime;
        startsTime = ckt->CKTstat->STATsolveTime;
@ -336,7 +336,7 @@ DCtran(CKTcircuit *ckt,
        /* saj As traninit resets CKTmode */
        ckt->CKTmode = (ckt->CKTmode&MODEUIC) | MODETRAN | MODEINITPRED;
        /* saj */
-        startTime=(*(SPfrontEnd->IFseconds))();
+        startTime = SPfrontEnd->IFseconds();
        startIters = ckt->CKTstat->STATnumIter;
        startdTime = ckt->CKTstat->STATdecompTime;
        startsTime = ckt->CKTstat->STATsolveTime;
@ -350,9 +350,9 @@ DCtran(CKTcircuit *ckt,
        error = CKTnames(ckt,&numNames,&nameList);
        if(error) return(error);
        /* get timeUiD again */
-        (*(SPfrontEnd->IFnewUid))(ckt,&timeUid,(IFuid)NULL,
+        SPfrontEnd->IFnewUid (ckt, &timeUid, (IFuid)NULL,
                "time", UID_OTHER, NULL);
-        error = (*(SPfrontEnd->OUTpBeginPlot))(ckt, ckt->CKTcurJob,
+        error = SPfrontEnd->OUTpBeginPlot (ckt, ckt->CKTcurJob,
                 ckt->CKTcurJob->JOBname,timeUid,IF_REAL,666,nameList,
                 666,&(((TRANan*)ckt->CKTcurJob)->TRANplot));/* magic 666 nums as flags */
        tfree(nameList);
@ -409,7 +409,7 @@ DCtran(CKTcircuit *ckt,
    /* XXX Error will cause single process to bail. */
    if(error)  {
        ckt->CKTcurrentAnalysis = DOING_TRAN;
-        ckt->CKTstat->STATtranTime += (*(SPfrontEnd->IFseconds))()-startTime;
+        ckt->CKTstat->STATtranTime += SPfrontEnd->IFseconds() - startTime;
        ckt->CKTstat->STATtranIter += ckt->CKTstat->STATnumIter - startIters;
        ckt->CKTstat->STATtranDecompTime += ckt->CKTstat->STATdecompTime -
                startdTime;
@ -492,9 +492,9 @@ DCtran(CKTcircuit *ckt,
        printf(" done:  time is %g, final time is %g, and tol is %g\n",
        ckt->CKTtime,ckt->CKTfinalTime,ckt->CKTminBreak);
 #endif
-        (*(SPfrontEnd->OUTendPlot))( (((TRANan*)ckt->CKTcurJob)->TRANplot));
+        SPfrontEnd->OUTendPlot (((TRANan*)ckt->CKTcurJob)->TRANplot);
        ckt->CKTcurrentAnalysis = 0;
-        ckt->CKTstat->STATtranTime += (*(SPfrontEnd->IFseconds))()-startTime;
+        ckt->CKTstat->STATtranTime += SPfrontEnd->IFseconds() - startTime;
        ckt->CKTstat->STATtranIter += ckt->CKTstat->STATnumIter - startIters;
        ckt->CKTstat->STATtranDecompTime += ckt->CKTstat->STATdecompTime -
                startdTime;
@ -516,10 +516,10 @@ DCtran(CKTcircuit *ckt,
 #endif
        return(OK);
    }
-    if( (*(SPfrontEnd->IFpauseTest))() ) {
+    if(SPfrontEnd->IFpauseTest()) {
        /* user requested pause... */
        ckt->CKTcurrentAnalysis = DOING_TRAN;
-        ckt->CKTstat->STATtranTime += (*(SPfrontEnd->IFseconds))()-startTime;
+        ckt->CKTstat->STATtranTime += SPfrontEnd->IFseconds() - startTime;
        ckt->CKTstat->STATtranIter += ckt->CKTstat->STATnumIter - startIters;
        ckt->CKTstat->STATtranDecompTime += ckt->CKTstat->STATdecompTime -
                startdTime;
@ -859,7 +859,7 @@ resume:
            if(error) {
                ckt->CKTcurrentAnalysis = DOING_TRAN;
                ckt->CKTstat->STATtranTime +=
-                        (*(SPfrontEnd->IFseconds))() - startTime;
+                        SPfrontEnd->IFseconds() - startTime;
                ckt->CKTstat->STATtranIter +=
                        ckt->CKTstat->STATnumIter - startIters;
                ckt->CKTstat->STATtranDecompTime += ckt->CKTstat->STATdecompTime
@ -882,7 +882,7 @@ resume:
                    if(error) {
                        ckt->CKTcurrentAnalysis = DOING_TRAN;
                        ckt->CKTstat->STATtranTime +=
-                                (*(SPfrontEnd->IFseconds))() - startTime;
+                                SPfrontEnd->IFseconds() - startTime;
                        ckt->CKTstat->STATtranIter +=
                                ckt->CKTstat->STATnumIter - startIters;
                        ckt->CKTstat->STATtranDecompTime +=
@ -962,7 +962,7 @@ resume:
            } else {
                ckt->CKTcurrentAnalysis = DOING_TRAN;
                ckt->CKTstat->STATtranTime +=
-                        (*(SPfrontEnd->IFseconds))()-startTime;
+                        SPfrontEnd->IFseconds() - startTime;
                ckt->CKTstat->STATtranIter +=
                        ckt->CKTstat->STATnumIter - startIters;
                ckt->CKTstat->STATtranDecompTime +=
--- a/src/spicelib/analysis/dctrcurv.c
+++ b/src/spicelib/analysis/dctrcurv.c
@ -66,7 +66,7 @@ DCtrCurv(CKTcircuit *ckt, int restart)
        /* continuing */
        i = cv->TRCVnestState;
        /* resume to work? saj*/
-        error = (*(SPfrontEnd->OUTpBeginPlot))(ckt,
+        error = SPfrontEnd->OUTpBeginPlot (ckt,
           ckt->CKTcurJob, ckt->CKTcurJob->JOBname,
           varUid,IF_REAL,666,nameList, 666,&plot);	
        goto resume;
@ -156,8 +156,8 @@ DCtrCurv(CKTcircuit *ckt, int restart)
            CKTtemp(ckt);
            goto found;
        }
-   
-        (*(SPfrontEnd->IFerror))(ERR_FATAL, 
+
+        SPfrontEnd->IFerror (ERR_FATAL,
                "DCtrCurv: source / resistor %s not in circuit", &(cv->TRCVvName[i]));
        return(E_NODEV);

@ -190,32 +190,32 @@ found:;
    
    
    if (cv->TRCVvType[i]==vcode)
-         (*(SPfrontEnd->IFnewUid))(ckt,&varUid,(IFuid )NULL,
+         SPfrontEnd->IFnewUid (ckt, &varUid, (IFuid )NULL,
            "v-sweep", UID_OTHER, NULL);
        
    else {
        if (cv->TRCVvType[i]==icode)
-            (*(SPfrontEnd->IFnewUid))(ckt,&varUid,(IFuid )NULL,
+            SPfrontEnd->IFnewUid (ckt, &varUid, (IFuid )NULL,
                 "i-sweep", UID_OTHER, NULL);
                     
        else {
            if (cv->TRCVvType[i]==TEMP_CODE)
-                (*(SPfrontEnd->IFnewUid))(ckt,&varUid,(IFuid )NULL,
+                SPfrontEnd->IFnewUid (ckt, &varUid, (IFuid )NULL,
                   "temp-sweep", UID_OTHER, NULL);
       
            else {
                if (cv->TRCVvType[i]==rcode)
-                    (*(SPfrontEnd->IFnewUid))(ckt,&varUid,(IFuid )NULL,
+                    SPfrontEnd->IFnewUid (ckt, &varUid, (IFuid )NULL,
                        "res-sweep", UID_OTHER, NULL);
                                
                else
-                    (*(SPfrontEnd->IFnewUid))(ckt,&varUid,(IFuid )NULL,
+                    SPfrontEnd->IFnewUid (ckt, &varUid, (IFuid )NULL,
                        "?-sweep", UID_OTHER, NULL);
            } /* icode */
        } /* TEMP_CODE */
    } /* rcode*/
    
-    error = (*(SPfrontEnd->OUTpBeginPlot))(ckt,
+    error = SPfrontEnd->OUTpBeginPlot (ckt,
        ckt->CKTcurJob, ckt->CKTcurJob->JOBname,
        varUid,IF_REAL,numNames,nameList, IF_REAL,&plot);
    
@ -508,7 +508,7 @@ nextstep:;
            CKTtemp(ckt);	    
        } /* else not possible */
        
-        if( (*(SPfrontEnd->IFpauseTest))() ) {
+        if(SPfrontEnd->IFpauseTest()) {
            /* user asked us to pause, so save state */
            cv->TRCVnestState = i;
            return(E_PAUSE);
@ -551,7 +551,7 @@ nextstep:;
            CKTtemp(ckt);
        } /* else not possible */
    }
-    (*(SPfrontEnd->OUTendPlot))(plot);
+    SPfrontEnd->OUTendPlot (plot);

    return(OK);
 }
--- a/src/spicelib/analysis/distoan.c
+++ b/src/spicelib/analysis/distoan.c
@ -62,7 +62,7 @@ DISTOan(CKTcircuit *ckt, int restart)
 		/* start at beginning */

 #ifdef D_DBG_BLOCKTIMES
-time1 = (*(SPfrontEnd->IFseconds))();
+time1 = SPfrontEnd->IFseconds();
 #endif
        switch(job->DstepType) {

@ -107,26 +107,26 @@ time1 = (*(SPfrontEnd->IFseconds))();

 	if (ckt->CKTkeepOpInfo) {
 	    /* Dump operating point. */
-	    error = (*(SPfrontEnd->OUTpBeginPlot))(ckt,
+	    error = SPfrontEnd->OUTpBeginPlot (ckt,
 		ckt->CKTcurJob, "Distortion Operating Point",
 		(IFuid)NULL,IF_REAL,numNames,nameList, IF_REAL,&acPlot);
 	    if(error) return(error);
 	    CKTdump(ckt,(double)0,acPlot);
-	    (*(SPfrontEnd->OUTendPlot))(acPlot);
+	    SPfrontEnd->OUTendPlot (acPlot);
 	    acPlot = NULL;
 	}

 #ifdef D_DBG_BLOCKTIMES
-time1 = (*(SPfrontEnd->IFseconds))() - time1;
+time1 = SPfrontEnd->IFseconds() - time1;
 printf("Time for initial work (including op. pt.): %g seconds \n", time1);
 #endif

 #ifdef D_DBG_BLOCKTIMES
-time1 = (*(SPfrontEnd->IFseconds))();
+time1 = SPfrontEnd->IFseconds();
 #endif
 	error = CKTdisto(ckt,D_SETUP);
 #ifdef D_DBG_BLOCKTIMES
-time1 = (*(SPfrontEnd->IFseconds))() - time1;
+time1 = SPfrontEnd->IFseconds() - time1;
 printf("Time outside D_SETUP: %g seconds \n", time1);
 #endif
 	if (error) return(error);
@ -134,7 +134,7 @@ printf("Time outside D_SETUP: %g seconds \n", time1);
 	displacement = 0;

 #ifdef D_DBG_BLOCKTIMES
-time1 = (*(SPfrontEnd->IFseconds))();
+time1 = SPfrontEnd->IFseconds();
 #endif
        freq = job->DstartF1;
 	if (job->Df2wanted) {
@ -244,19 +244,19 @@ time1 = (*(SPfrontEnd->IFseconds))();
 }
 		
 #ifdef D_DBG_BLOCKTIMES
-time1 = (*(SPfrontEnd->IFseconds))() - time1;
+time1 = SPfrontEnd->IFseconds() - time1;
 printf("Time for other setup (storage allocation etc.): %g seconds \n", time1);
 #endif



 #ifdef D_DBG_BLOCKTIMES
-time1 = (*(SPfrontEnd->IFseconds))();
+time1 = SPfrontEnd->IFseconds();
 #endif
    while(freq <= job->DstopF1+freqTol) {

 /*
-        if( (*(SPfrontEnd->IFpauseTest))() ) { 
+        if(SPfrontEnd->IFpauseTest()) {
            job->DsaveF1 = freq;
            return(E_PAUSE);
        }
@ -265,30 +265,30 @@ time1 = (*(SPfrontEnd->IFseconds))();
 	job->Domega1 = ckt->CKTomega;
        ckt->CKTmode = (ckt->CKTmode&MODEUIC) | MODEAC;
 #ifdef D_DBG_SMALLTIMES
-time = (*(SPfrontEnd->IFseconds))();
+time = SPfrontEnd->IFseconds();
 #endif
 	error = CKTacLoad(ckt);
 #ifdef D_DBG_SMALLTIMES
-time = (*(SPfrontEnd->IFseconds))() - time;
+time = SPfrontEnd->IFseconds() - time;
 printf("Time for CKTacLoad: %g seconds \n", time);
 #endif
 	if (error) return(error);
 #ifdef D_DBG_SMALLTIMES
-time = (*(SPfrontEnd->IFseconds))();
+time = SPfrontEnd->IFseconds();
 #endif
 	error = CKTdisto(ckt,D_RHSF1); /* sets up the RHS vector
 			for all inputs corresponding to F1 */
 #ifdef D_DBG_SMALLTIMES
-time = (*(SPfrontEnd->IFseconds))() - time;
+time = SPfrontEnd->IFseconds() - time;
 printf("Time outside DISTO_RHSFIX: %g seconds \n", time);
 #endif
 	if (error) return(error);
 #ifdef D_DBG_SMALLTIMES
-time = (*(SPfrontEnd->IFseconds))();
+time = SPfrontEnd->IFseconds();
 #endif
 	error = NIdIter(ckt);
 #ifdef D_DBG_SMALLTIMES
-time = (*(SPfrontEnd->IFseconds))() - time;
+time = SPfrontEnd->IFseconds() - time;
 printf("Time for NIdIter: %g seconds \n", time);
 #endif
 	if (error) return(error);
@ -299,11 +299,11 @@ printf("Time for NIdIter: %g seconds \n", time);
 	error = CKTacLoad(ckt);
 	if (error) return(error);
 #ifdef D_DBG_SMALLTIMES
-time = (*(SPfrontEnd->IFseconds))();
+time = SPfrontEnd->IFseconds();
 #endif
 	error = CKTdisto(ckt,D_TWOF1);
 #ifdef D_DBG_SMALLTIMES
-time = (*(SPfrontEnd->IFseconds))() - time;
+time = SPfrontEnd->IFseconds() - time;
 printf("Time outside D_TWOF1: %g seconds \n", time);
 #endif
 	if (error) return(error);
@ -320,11 +320,11 @@ printf("Time outside D_TWOF1: %g seconds \n", time);
 		error = CKTacLoad(ckt);
 		if (error) return(error);
 #ifdef D_DBG_SMALLTIMES
-time = (*(SPfrontEnd->IFseconds))();
+time = SPfrontEnd->IFseconds();
 #endif
 		error = CKTdisto(ckt,D_THRF1);
 #ifdef D_DBG_SMALLTIMES
-time = (*(SPfrontEnd->IFseconds))() - time;
+time = SPfrontEnd->IFseconds() - time;
 printf("Time outside D_THRF1: %g seconds \n", time);
 #endif
 		if (error) return(error);
@ -347,11 +347,11 @@ printf("Time outside D_THRF1: %g seconds \n", time);
 		error = CKTacLoad(ckt);
 		if (error) return(error);
 #ifdef D_DBG_SMALLTIMES
-time = (*(SPfrontEnd->IFseconds))();
+time = SPfrontEnd->IFseconds();
 #endif
 		error = CKTdisto(ckt,D_RHSF2);
 #ifdef D_DBG_SMALLTIMES
-time = (*(SPfrontEnd->IFseconds))() - time;
+time = SPfrontEnd->IFseconds() - time;
 printf("Time outside DISTO_RHSFIX: %g seconds \n", time);
 #endif
 		if (error) return(error);
@ -366,11 +366,11 @@ printf("Time outside DISTO_RHSFIX: %g seconds \n", time);
 		error = CKTacLoad(ckt);
 		if (error) return(error);
 #ifdef D_DBG_SMALLTIMES
-time = (*(SPfrontEnd->IFseconds))();
+time = SPfrontEnd->IFseconds();
 #endif
 		error = CKTdisto(ckt,D_F1PF2);
 #ifdef D_DBG_SMALLTIMES
-time = (*(SPfrontEnd->IFseconds))() - time;
+time = SPfrontEnd->IFseconds() - time;
 printf("Time outside D_F1PF2: %g seconds \n", time);
 #endif
 		if (error) return(error);
@ -386,11 +386,11 @@ printf("Time outside D_F1PF2: %g seconds \n", time);
 		error = CKTacLoad(ckt);
 		if (error) return(error);
 #ifdef D_DBG_SMALLTIMES
-time = (*(SPfrontEnd->IFseconds))();
+time = SPfrontEnd->IFseconds();
 #endif
 		error = CKTdisto(ckt,D_F1MF2);
 #ifdef D_DBG_SMALLTIMES
-time = (*(SPfrontEnd->IFseconds))() - time;
+time = SPfrontEnd->IFseconds() - time;
 printf("Time outside D_F1MF2: %g seconds \n", time);
 #endif
 		if (error) return(error);
@ -405,11 +405,11 @@ printf("Time outside D_F1MF2: %g seconds \n", time);
 		error = CKTacLoad(ckt);
 		if (error) return(error);
 #ifdef D_DBG_SMALLTIMES
-time = (*(SPfrontEnd->IFseconds))();
+time = SPfrontEnd->IFseconds();
 #endif
 		error = CKTdisto(ckt,D_2F1MF2);
 #ifdef D_DBG_SMALLTIMES
-time = (*(SPfrontEnd->IFseconds))() - time;
+time = SPfrontEnd->IFseconds() - time;
 printf("Time outside D_2F1MF2: %g seconds \n", time);
 #endif
 		if (error) return(error);
@ -496,7 +496,7 @@ printf("Time outside D_2F1MF2: %g seconds \n", time);
        }
 	}
 #ifdef D_DBG_BLOCKTIMES
-time1 = (*(SPfrontEnd->IFseconds))() - time1;
+time1 = SPfrontEnd->IFseconds() - time1;
 printf("Time inside frequency loop: %g seconds \n", time1);
 #endif
    
@ -506,7 +506,7 @@ endsweep:
    /* output routines to process the H's and output actual ckt variable
       values */
 #ifdef D_DBG_BLOCKTIMES
-time1 = (*(SPfrontEnd->IFseconds))();
+time1 = SPfrontEnd->IFseconds();
 #endif

       
@ -514,13 +514,13 @@ time1 = (*(SPfrontEnd->IFseconds))();
 	if (! job->Df2wanted) {
 	error = CKTnames(ckt,&numNames,&nameList);
 	if(error) return(error);
-	(*(SPfrontEnd->IFnewUid))(ckt,&freqUid,(IFuid)NULL,
+	SPfrontEnd->IFnewUid (ckt, &freqUid, (IFuid)NULL,
 		"frequency", UID_OTHER, NULL);
-	(*(SPfrontEnd->OUTpBeginPlot))(ckt,
+	SPfrontEnd->OUTpBeginPlot (ckt,
 	    ckt->CKTcurJob, "DISTORTION - 2nd harmonic",
 	    freqUid,IF_REAL, numNames,nameList,IF_COMPLEX,&acPlot);
        if (job->DstepType != LINEAR) {
-	    (*(SPfrontEnd->OUTattributes))((void *)acPlot,NULL,
+	    SPfrontEnd->OUTattributes (acPlot, NULL,
 		OUT_SCALE_LOG, NULL);
 	}
       for (i=0; i< displacement ; i++)
@ -533,14 +533,14 @@ time1 = (*(SPfrontEnd->IFseconds))();
 	error = CKTacDump(ckt,ckt->CKTrhsOld[0],acPlot);
        if(error) return(error);
 	}
-	(*(SPfrontEnd->OUTendPlot))(acPlot);
+	SPfrontEnd->OUTendPlot (acPlot);
 	acPlot = NULL;

 	error = CKTnames(ckt,&numNames,&nameList);
 	if(error) return(error);
-	(*(SPfrontEnd->IFnewUid))(ckt,&freqUid,(IFuid)NULL,
+	SPfrontEnd->IFnewUid (ckt, &freqUid, (IFuid)NULL,
 		"frequency", UID_OTHER, NULL);
-	(*(SPfrontEnd->OUTpBeginPlot))(ckt,
+	SPfrontEnd->OUTpBeginPlot (ckt,
 	ckt->CKTcurJob, "DISTORTION - 3rd harmonic", freqUid, IF_REAL,
 	numNames,nameList,IF_COMPLEX,&acPlot);
       for (i=0; i< displacement ; i++)
@ -552,7 +552,7 @@ time1 = (*(SPfrontEnd->IFseconds))();
 	ckt->CKTirhsOld = *((job->i3H11stor) + i);
 	error = CKTacDump(ckt,ckt->CKTrhsOld[0],acPlot);
 	}
-	(*(SPfrontEnd->OUTendPlot))(acPlot);
+	SPfrontEnd->OUTendPlot (acPlot);
 	acPlot = NULL;
      
 	} else {
@ -560,9 +560,9 @@ time1 = (*(SPfrontEnd->IFseconds))();

 	error = CKTnames(ckt,&numNames,&nameList);
 	if(error) return(error);
-	(*(SPfrontEnd->IFnewUid))(ckt,&freqUid,(IFuid)NULL,
+	SPfrontEnd->IFnewUid (ckt, &freqUid, (IFuid)NULL,
 		"frequency", UID_OTHER, NULL);
-	(*(SPfrontEnd->OUTpBeginPlot))(ckt,
+	SPfrontEnd->OUTpBeginPlot (ckt,
 	ckt->CKTcurJob, "DISTORTION - IM: f1+f2", freqUid, IF_REAL,
 	numNames,nameList,IF_COMPLEX,&acPlot);
 	   for (i=0; i< displacement ; i++)
@ -575,14 +575,14 @@ time1 = (*(SPfrontEnd->IFseconds))();
 	error = CKTacDump(ckt,ckt->CKTrhsOld[0],acPlot);
 	    if(error) return(error);
 	    }
-	(*(SPfrontEnd->OUTendPlot))(acPlot);
+	SPfrontEnd->OUTendPlot (acPlot);
 	acPlot = NULL;

 	error = CKTnames(ckt,&numNames,&nameList);
 	if(error) return(error);
-	(*(SPfrontEnd->IFnewUid))(ckt,&freqUid,(IFuid)NULL,
+	SPfrontEnd->IFnewUid (ckt, &freqUid, (IFuid)NULL,
 		"frequency", UID_OTHER, NULL);
-	(*(SPfrontEnd->OUTpBeginPlot))(ckt,
+	SPfrontEnd->OUTpBeginPlot (ckt,
 	ckt->CKTcurJob, "DISTORTION - IM: f1-f2", freqUid, IF_REAL,
 	numNames,nameList,IF_COMPLEX,&acPlot);
 	   for (i=0; i< displacement ; i++)
@ -596,14 +596,14 @@ time1 = (*(SPfrontEnd->IFseconds))();
 	error = CKTacDump(ckt,ckt->CKTrhsOld[0],acPlot);
 	    if(error) return(error);
 	    }
-	(*(SPfrontEnd->OUTendPlot))(acPlot);
+	SPfrontEnd->OUTendPlot (acPlot);
 	acPlot = NULL;

 	error = CKTnames(ckt,&numNames,&nameList);
 	if(error) return(error);
-	(*(SPfrontEnd->IFnewUid))(ckt,&freqUid,(IFuid)NULL,
+	SPfrontEnd->IFnewUid (ckt, &freqUid, (IFuid)NULL,
 		"frequency", UID_OTHER, NULL);
-	(*(SPfrontEnd->OUTpBeginPlot))(ckt,
+	SPfrontEnd->OUTpBeginPlot (ckt,
 	ckt->CKTcurJob, "DISTORTION - IM: 2f1-f2", freqUid, IF_REAL,
 	numNames,nameList,IF_COMPLEX,&acPlot);
 	   for (i=0; i< displacement ; i++)
@ -617,7 +617,7 @@ time1 = (*(SPfrontEnd->IFseconds))();
 	error = CKTacDump(ckt,ckt->CKTrhsOld[0],acPlot);
 	    if(error) return(error);
 	    }
-	(*(SPfrontEnd->OUTendPlot))(acPlot);
+	SPfrontEnd->OUTendPlot (acPlot);
 	acPlot = NULL;

    }
@ -660,7 +660,7 @@ FREE(job->i2H1m2stor);
 FREE(job->i3H1m2stor);
    }
 #ifdef D_DBG_BLOCKTIMES
-time1 = (*(SPfrontEnd->IFseconds))() - time1;
+time1 = SPfrontEnd->IFseconds() - time1;
 printf("Time for output and deallocation: %g seconds \n", time1);
 #endif
    return(OK);
--- a/src/spicelib/analysis/noisean.c
+++ b/src/spicelib/analysis/noisean.c
@ -63,7 +63,7 @@ NOISEan (CKTcircuit *ckt, int restart)
                job->input, (GENmodel *)NULL, (IFuid)NULL);
        if (error) {
 	    /* XXX ??? */
-            (*(SPfrontEnd->IFerror))(ERR_WARNING,
+            SPfrontEnd->IFerror (ERR_WARNING,
                    "Noise input source %s not in circuit",
                    &job->input);
 		return (E_NOTFOUND);
@ -120,7 +120,7 @@ NOISEan (CKTcircuit *ckt, int restart)
 	/* the current front-end needs the namelist to be fully
 		declared before an OUTpBeginplot */

-	(*(SPfrontEnd->IFnewUid))(ckt,&freqUid,(IFuid)NULL,
+	SPfrontEnd->IFnewUid (ckt, &freqUid, (IFuid)NULL,
 		"frequency", UID_OTHER, NULL);

 	data->numPlots = 0;                /* we don't have any plots  yet */
@ -132,14 +132,14 @@ NOISEan (CKTcircuit *ckt, int restart)
 	 * plot
 	 */

-	error = (*(SPfrontEnd->OUTpBeginPlot))(ckt, ckt->CKTcurJob,
+	error = SPfrontEnd->OUTpBeginPlot (ckt, ckt->CKTcurJob,
 	   "Noise Spectral Density Curves - (V^2 or A^2)/Hz",
 	   freqUid,IF_REAL,data->numPlots,data->namelist,IF_REAL,
 	   &(data->NplotPtr));
 	if (error) return(error);

        if (job->NstpType != LINEAR) {
-	    (*(SPfrontEnd->OUTattributes))((void *)data->NplotPtr,NULL,
+	    SPfrontEnd->OUTattributes (data->NplotPtr, NULL,
 		    OUT_SCALE_LOG, NULL);
 	}

@ -166,7 +166,7 @@ NOISEan (CKTcircuit *ckt, int restart)
 	data->outNoiz = job->NsavOnoise;
 	data->inNoise = job->NsavInoise;
 	/* saj resume rawfile fix*/
-	error = (*(SPfrontEnd->OUTpBeginPlot))(ckt, ckt->CKTcurJob,
+	error = SPfrontEnd->OUTpBeginPlot (ckt, ckt->CKTcurJob,
 	   "Noise Spectral Density Curves - (V^2 or A^2)/Hz",
 	   freqUid,IF_REAL,666,data->namelist,666,
 	   &(data->NplotPtr));
@ -190,7 +190,7 @@ NOISEan (CKTcircuit *ckt, int restart)
    /* do the noise analysis over all frequencies */

    while (data->freq <= job->NstopFreq + freqTol) {
-        if( (*(SPfrontEnd->IFpauseTest))() ) { 
+        if(SPfrontEnd->IFpauseTest()) {
 	    job->NsavFstp = step;   /* save our results */
 	    job->NsavOnoise = data->outNoiz; /* up until now     */
 	    job->NsavInoise = data->inNoise;
@ -277,7 +277,7 @@ NOISEan (CKTcircuit *ckt, int restart)

 	if (error) return(error);

-	(*(SPfrontEnd->OUTpBeginPlot))(ckt, ckt->CKTcurJob,
+	SPfrontEnd->OUTpBeginPlot (ckt, ckt->CKTcurJob,
 	       "Integrated Noise - V^2 or A^2",
 	       (IFuid)NULL,(int)0,data->numPlots,data->namelist,IF_REAL,
 	       &(data->NplotPtr));
--- a/src/spicelib/analysis/pzan.c
+++ b/src/spicelib/analysis/pzan.c
@ -45,12 +45,12 @@ PZan(CKTcircuit *ckt, int reset)
 	/* Dump operating point. */
 	error = CKTnames(ckt,&numNames,&nameList);
 	if(error) return(error);
-	error = (*(SPfrontEnd->OUTpBeginPlot))(ckt,
+	error = SPfrontEnd->OUTpBeginPlot (ckt,
 	    ckt->CKTcurJob, "Distortion Operating Point",
 	    (IFuid)NULL,IF_REAL,numNames,nameList, IF_REAL,&plot);
 	if(error) return(error);
 	CKTdump(ckt,(double)0,plot);
-	(*(SPfrontEnd->OUTendPlot))(plot);
+	SPfrontEnd->OUTendPlot (plot);
    }

    if (pzan->PZwhich & PZ_DO_POLES) {
@ -138,16 +138,16 @@ PZpost(CKTcircuit *ckt)
    j = 0;
    for (i = 0; i < pzan->PZnPoles; i++) {
 	sprintf(name, "pole(%-u)", i+1);
-	(*(SPfrontEnd->IFnewUid))(ckt,&(namelist[j++]),(IFuid)NULL,
+	SPfrontEnd->IFnewUid (ckt, &(namelist[j++]), (IFuid)NULL,
 		name, UID_OTHER, NULL);
    }
    for (i = 0; i < pzan->PZnZeros; i++) {
 	sprintf(name, "zero(%-u)", i+1);
-	(*(SPfrontEnd->IFnewUid))(ckt,&(namelist[j++]),(IFuid)NULL,
+	SPfrontEnd->IFnewUid (ckt, &(namelist[j++]), (IFuid)NULL,
 		name, UID_OTHER, NULL);
    }

-    (*SPfrontEnd->OUTpBeginPlot)(ckt, (JOB *)pzan, pzan->JOBname,
+    SPfrontEnd->OUTpBeginPlot (ckt, (JOB *)pzan, pzan->JOBname,
 	    (IFuid)NULL, (int)0, pzan->PZnPoles + pzan->PZnZeros, namelist,
 	    IF_COMPLEX, &pzPlotPtr);

@ -189,8 +189,8 @@ PZpost(CKTcircuit *ckt)
    outData.v.numValue = pzan->PZnPoles + pzan->PZnZeros;
    outData.v.vec.cVec = out_list;

-    (*SPfrontEnd->OUTpData)(pzPlotPtr, (IFvalue *) 0, &outData); 
-    (*(SPfrontEnd->OUTendPlot))(pzPlotPtr);
+    SPfrontEnd->OUTpData (pzPlotPtr, (IFvalue *) NULL, &outData);
+    SPfrontEnd->OUTendPlot (pzPlotPtr);

    return(OK);
 }
--- a/src/spicelib/analysis/tfanal.c
+++ b/src/spicelib/analysis/tfanal.c
@ -66,7 +66,7 @@ TFanal(CKTcircuit *ckt, int restart)
        ((TFan*)ckt->CKTcurJob)->TFinIsV = 1;
        ((TFan*)ckt->CKTcurJob)->TFinIsI = 0;
        if(error !=0) {
-            (*(SPfrontEnd->IFerror))(ERR_WARNING,
+            SPfrontEnd->IFerror (ERR_WARNING,
                    "Transfer function source %s not in circuit",
                    &(((TFan*)ckt->CKTcurJob)->TFinSrc));
            ((TFan*)ckt->CKTcurJob)->TFinIsV = 0;
@ -92,26 +92,26 @@ TFanal(CKTcircuit *ckt, int restart)
    ckt->CKTrhs[0]=0;

    /* make a UID for the transfer function output */
-    (*(SPfrontEnd->IFnewUid))(ckt,&tfuid,(IFuid)NULL,"Transfer_function",
+    SPfrontEnd->IFnewUid (ckt, &tfuid, (IFuid)NULL, "Transfer_function",
            UID_OTHER, NULL);

    /* make a UID for the input impedance */
-    (*(SPfrontEnd->IFnewUid))(ckt,&inuid,((TFan*)ckt->CKTcurJob)->TFinSrc,
+    SPfrontEnd->IFnewUid (ckt, &inuid, ((TFan*)ckt->CKTcurJob)->TFinSrc,
            "Input_impedance", UID_OTHER, NULL);

    /* make a UID for the output impedance */
    if(((TFan*)ckt->CKTcurJob)->TFoutIsI) {
-        (*(SPfrontEnd->IFnewUid))(ckt,&outuid,((TFan*)ckt->CKTcurJob)->TFoutSrc
+        SPfrontEnd->IFnewUid (ckt, &outuid, ((TFan*)ckt->CKTcurJob)->TFoutSrc
                ,"Output_impedance", UID_OTHER, NULL);
    } else {
        name = TMALLOC(char, strlen(((TFan*)ckt->CKTcurJob)->TFoutName) + 22);
        (void)sprintf(name,"output_impedance_at_%s",
                ((TFan*)ckt->CKTcurJob)->TFoutName);
-        (*(SPfrontEnd->IFnewUid))(ckt,&outuid,(IFuid)NULL,
+        SPfrontEnd->IFnewUid (ckt, &outuid, (IFuid)NULL,
                name, UID_OTHER, NULL);
    }

-    error = (*(SPfrontEnd->OUTpBeginPlot))(ckt, ckt->CKTcurJob,
+    error = SPfrontEnd->OUTpBeginPlot (ckt, ckt->CKTcurJob,
            ((TFan*)(ckt->CKTcurJob))->JOBname,(IFuid)NULL,(int)0,3,
            uids,IF_REAL,&plotptr);
    if(error) return(error);
@ -167,8 +167,8 @@ done:
    outdata.v.numValue=3;
    outdata.v.vec.rVec=outputs;
    refval.rValue = 0;
-    (*(SPfrontEnd->OUTpData))(plotptr,&refval,&outdata);
-    (*(SPfrontEnd->OUTendPlot))(plotptr);
+    SPfrontEnd->OUTpData (plotptr, &refval, &outdata);
+    SPfrontEnd->OUTendPlot (plotptr);
    return(OK);
 }

--- a/src/spicelib/devices/asrc/asrcconv.c
+++ b/src/spicelib/devices/asrc/asrcconv.c
@ -47,7 +47,7 @@ ASRCconvTest(GENmodel *inModel, CKTcircuit *ckt)
                }
            }

-            if( (*(here->ASRCtree->IFeval))(here->ASRCtree, ckt->CKTgmin, &rhs,
+            if( here->ASRCtree->IFeval (here->ASRCtree, ckt->CKTgmin, &rhs,
                    asrc_vals,asrc_derivs) == OK){

                prev = here->ASRCprev_value;
--- a/src/spicelib/devices/asrc/asrcload.c
+++ b/src/spicelib/devices/asrc/asrcload.c
@ -67,7 +67,7 @@ ASRCload(GENmodel *inModel, CKTcircuit *ckt)
 		    asrc_vals[i] = *(ckt->CKTrhsOld + node_num);
 		}

-	    if ((*(here->ASRCtree->IFeval))(here->ASRCtree,ckt->CKTgmin, &rhs, asrc_vals,asrc_derivs) != OK)
+	    if (here->ASRCtree->IFeval (here->ASRCtree, ckt->CKTgmin, &rhs, asrc_vals, asrc_derivs) != OK)
 		return(E_BADPARM);

 	    /* The convergence test */
--- a/src/spicelib/devices/asrc/asrcpzld.c
+++ b/src/spicelib/devices/asrc/asrcpzld.c
@ -60,7 +60,7 @@ ASRCpzLoad(GENmodel *inModel, CKTcircuit *ckt, SPcomplex *s)
                }
            }

-            if((*(here->ASRCtree->IFeval))(here->ASRCtree, ckt->CKTgmin, &value, asrc_vals, asrc_derivs) != OK)
+            if(here->ASRCtree->IFeval (here->ASRCtree, ckt->CKTgmin, &value, asrc_vals, asrc_derivs) != OK)
                return(E_BADPARM);

            if( here->ASRCtype == ASRC_VOLTAGE) {
--- a/src/spicelib/devices/asrc/asrcset.c
+++ b/src/spicelib/devices/asrc/asrcset.c
@ -68,7 +68,7 @@ if((here->ptr = SMPmakeElt(matrix, here->first, (second)->number))\
 	    if( here->ASRCtype == ASRC_VOLTAGE) {

                if(here->ASRCposNode == here->ASRCnegNode) {
-                    (*(SPfrontEnd->IFerror))(ERR_FATAL,
+                    SPfrontEnd->IFerror (ERR_FATAL,
                              "instance %s is a shorted ASRC", &here->ASRCname);
                    return(E_UNSUPP);
                }
@ -89,7 +89,7 @@ if((here->ptr = SMPmakeElt(matrix, here->first, (second)->number))\
                        IFuid namarray[2];
                        namarray[0] =  here->ASRCname;
                        namarray[1] = here->ASRCtree->vars[i].uValue;
-                        (*(SPfrontEnd->IFerror))(ERR_FATAL,
+                        SPfrontEnd->IFerror (ERR_FATAL,
                                "%s: unknown controlling source %s",namarray);
                        return(E_BADPARM);
                    }
--- a/src/spicelib/devices/bjt/bjtdisto.c
+++ b/src/spicelib/devices/bjt/bjtdisto.c
@ -191,7 +191,7 @@ BJTdisto(int mode, GENmodel *genmodel, CKTcircuit *ckt)
 		    /* ic term */

 #ifdef D_DBG_SMALLTIMES
-		    time = (*(SPfrontEnd->IFseconds))();
+		    time = SPfrontEnd->IFseconds();
 #endif
 		    temp = DFn2F1( here->ic_x2,
 				   here->ic_y2,
@ -219,7 +219,7 @@ BJTdisto(int mode, GENmodel *genmodel, CKTcircuit *ckt)
 				    r1h1z,
 				    i1h1z);
 #ifdef D_DBG_SMALLTIMES
-		    time = (*(SPfrontEnd->IFseconds))() - time;
+		    time = SPfrontEnd->IFseconds() - time;
 		    printf("Time for DFn2F1: %g seconds \n", time);
 #endif

@ -352,7 +352,7 @@ BJTdisto(int mode, GENmodel *genmodel, CKTcircuit *ckt)
 		    r1h1z = r1h1z + r1h1y;
 		    i1h1z = i1h1z + i1h1y;
 #ifdef D_DBG_SMALLTIMES
-		    time = (*(SPfrontEnd->IFseconds))();
+		    time = SPfrontEnd->IFseconds();
 #endif
 		    temp = - ckt->CKTomega *
 			D1i2F1(here->capbx2,
@ -363,7 +363,7 @@ BJTdisto(int mode, GENmodel *genmodel, CKTcircuit *ckt)
 			       r1h1z,
 			       i1h1z);
 #ifdef D_DBG_SMALLTIMES
-		    time = (*(SPfrontEnd->IFseconds))() - time;
+		    time = SPfrontEnd->IFseconds() - time;
 		    printf("Time for D1n2F1: %g seconds \n", time);
 #endif

@ -429,7 +429,7 @@ BJTdisto(int mode, GENmodel *genmodel, CKTcircuit *ckt)
 		    /* ic term */

 #ifdef D_DBG_SMALLTIMES
-		    time = (*(SPfrontEnd->IFseconds))();
+		    time = SPfrontEnd->IFseconds();
 #endif
 		    temp = DFn3F1( here->ic_x2,
 				   here->ic_y2,
@ -489,7 +489,7 @@ BJTdisto(int mode, GENmodel *genmodel, CKTcircuit *ckt)
 				    r2h11z,
 				    i2h11z);
 #ifdef D_DBG_SMALLTIMES
-		    time = (*(SPfrontEnd->IFseconds))() - time;
+		    time = SPfrontEnd->IFseconds() - time;
 		    printf("Time for DFn3F1: %g seconds \n", time);
 #endif

@ -725,7 +725,7 @@ BJTdisto(int mode, GENmodel *genmodel, CKTcircuit *ckt)
 		    r2h11z = r2h11z + r2h11y;
 		    i2h11z = i2h11z + i2h11y;
 #ifdef D_DBG_SMALLTIMES
-		    time = (*(SPfrontEnd->IFseconds))();
+		    time = SPfrontEnd->IFseconds();
 #endif
 		    temp = - ckt->CKTomega *
 			D1i3F1(here->capbx2,
@ -742,7 +742,7 @@ BJTdisto(int mode, GENmodel *genmodel, CKTcircuit *ckt)
 			       r2h11z,
 			       i2h11z);
 #ifdef D_DBG_SMALLTIMES
-		    time = (*(SPfrontEnd->IFseconds))() - time;
+		    time = SPfrontEnd->IFseconds() - time;
 		    printf("Time for D1n3F1: %g seconds \n", time);
 #endif

@ -872,7 +872,7 @@ BJTdisto(int mode, GENmodel *genmodel, CKTcircuit *ckt)
 		    /* loading ib term */
 		    /* x and y still the same */
 #ifdef D_DBG_SMALLTIMES
-		    time = (*(SPfrontEnd->IFseconds))();
+		    time = SPfrontEnd->IFseconds();
 #endif
 		    temp = DFnF12( here->ib_x2,
 				   here->ib_y2,
@ -912,7 +912,7 @@ BJTdisto(int mode, GENmodel *genmodel, CKTcircuit *ckt)
 				    0.0,
 				    0.0);
 #ifdef D_DBG_SMALLTIMES
-		    time = (*(SPfrontEnd->IFseconds))() - time;
+		    time = SPfrontEnd->IFseconds() - time;
 		    printf("Time for DFnF12: %g seconds \n", time);
 #endif

@ -1042,7 +1042,7 @@ BJTdisto(int mode, GENmodel *genmodel, CKTcircuit *ckt)
 		    r1h2z = r1h2z + r1h2y;
 		    i1h2z = i1h2z + i1h2y;
 #ifdef D_DBG_SMALLTIMES
-		    time = (*(SPfrontEnd->IFseconds))();
+		    time = SPfrontEnd->IFseconds();
 #endif
 		    temp = - ckt->CKTomega *
 			D1iF12(here->capbx2,
@ -1057,7 +1057,7 @@ BJTdisto(int mode, GENmodel *genmodel, CKTcircuit *ckt)
 			       r1h2z,
 			       i1h2z);
 #ifdef D_DBG_SMALLTIMES
-		    time = (*(SPfrontEnd->IFseconds))() - time;
+		    time = SPfrontEnd->IFseconds() - time;
 		    printf("Time for D1nF12: %g seconds \n", time);
 #endif

@ -1469,14 +1469,14 @@ BJTdisto(int mode, GENmodel *genmodel, CKTcircuit *ckt)
 		    pass.h2f1f2z =  r2h1m2z;
 		    pass.ih2f1f2z =   i2h1m2z;
 #ifdef D_DBG_SMALLTIMES
-		    time = (*(SPfrontEnd->IFseconds))();
+		    time = SPfrontEnd->IFseconds();
 #endif
 		    temp = DFn2F12(&pass);


 		    itemp = DFi2F12(&pass);
 #ifdef D_DBG_SMALLTIMES
-		    time = (*(SPfrontEnd->IFseconds))() - time;
+		    time = SPfrontEnd->IFseconds() - time;
 		    printf("Time for DFn2F12: %g seconds \n", time);
 #endif
 		}
@ -1691,7 +1691,7 @@ BJTdisto(int mode, GENmodel *genmodel, CKTcircuit *ckt)
 		r2h1m2z = r2h1m2z + r2h1m2y;
 		i2h1m2z = i2h1m2z + i2h1m2y;
 #ifdef D_DBG_SMALLTIMES
-		time = (*(SPfrontEnd->IFseconds))();
+		time = SPfrontEnd->IFseconds();
 #endif
 		temp = - ckt->CKTomega *
 		    D1i2F12(here->capbx2,
@ -1716,7 +1716,7 @@ BJTdisto(int mode, GENmodel *genmodel, CKTcircuit *ckt)
 			    r2h1m2z,
 			    i2h1m2z);
 #ifdef D_DBG_SMALLTIMES
-		time = (*(SPfrontEnd->IFseconds))() - time;
+		time = SPfrontEnd->IFseconds() - time;
 		printf("Time for D1n2F12: %g seconds \n", time);
 #endif

--- a/src/spicelib/devices/bjt/bjtnoise.c
+++ b/src/spicelib/devices/bjt/bjtnoise.c
@ -72,7 +72,7 @@ for (model=firstModel; model != NULL; model=model->BJTnextModel) {

 			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);
 				/* we've added one more plot */
@ -86,7 +86,7 @@ for (model=firstModel; model != NULL; model=model->BJTnextModel) {

 			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);
 				/* we've added one more plot */
@ -96,7 +96,7 @@ for (model=firstModel; model != NULL; model=model->BJTnextModel) {

 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);
 				/* we've added one more plot */
--- a/src/spicelib/devices/bjt/bjttemp.c
+++ b/src/spicelib/devices/bjt/bjttemp.c
@ -82,7 +82,7 @@ BJTtemp(GENmodel *inModel, CKTcircuit *ckt)
        if(model->BJTdepletionCapCoeffGiven) {
            if(model->BJTdepletionCapCoeff>.9999)  {
                model->BJTdepletionCapCoeff=.9999;
-                (*(SPfrontEnd->IFerror))(ERR_WARNING,
+                SPfrontEnd->IFerror (ERR_WARNING,
                        "BJT model %s, parameter fc limited to 0.9999",
                        &(model->BJTmodName));
            }
--- a/src/spicelib/devices/bjt2/bjt2disto.c
+++ b/src/spicelib/devices/bjt2/bjt2disto.c
@ -193,7 +193,7 @@ for( ; model != NULL; model = model->BJT2nextModel ) {
      /* ic term */

 #ifdef D_DBG_SMALLTIMES
-time = (*(SPfrontEnd->IFseconds))();
+time = SPfrontEnd->IFseconds();
 #endif
      temp = DFn2F1( here->ic_x2,
      here->ic_y2,
@ -221,7 +221,7 @@ time = (*(SPfrontEnd->IFseconds))();
      r1h1z,
      i1h1z);
 #ifdef D_DBG_SMALLTIMES
-time = (*(SPfrontEnd->IFseconds))() - time;
+time = SPfrontEnd->IFseconds() - time;
 printf("Time for DFn2F1: %g seconds \n", time);
 #endif

@ -354,7 +354,7 @@ printf("Time for DFn2F1: %g seconds \n", time);
      r1h1z = r1h1z + r1h1y;
      i1h1z = i1h1z + i1h1y;
 #ifdef D_DBG_SMALLTIMES
-time = (*(SPfrontEnd->IFseconds))();
+time = SPfrontEnd->IFseconds();
 #endif
      temp = - ckt->CKTomega *
          D1i2F1(here->capbx2,
@ -365,7 +365,7 @@ time = (*(SPfrontEnd->IFseconds))();
      r1h1z,
      i1h1z);
 #ifdef D_DBG_SMALLTIMES
-time = (*(SPfrontEnd->IFseconds))() - time;
+time = SPfrontEnd->IFseconds() - time;
 printf("Time for D1n2F1: %g seconds \n", time);
 #endif

@ -431,7 +431,7 @@ printf("Time for D1n2F1: %g seconds \n", time);
      /* ic term */

 #ifdef D_DBG_SMALLTIMES
-time = (*(SPfrontEnd->IFseconds))();
+time = SPfrontEnd->IFseconds();
 #endif
      temp = DFn3F1( here->ic_x2,
      here->ic_y2,
@ -491,7 +491,7 @@ time = (*(SPfrontEnd->IFseconds))();
      r2h11z,
      i2h11z);
 #ifdef D_DBG_SMALLTIMES
-time = (*(SPfrontEnd->IFseconds))() - time;
+time = SPfrontEnd->IFseconds() - time;
 printf("Time for DFn3F1: %g seconds \n", time);
 #endif

@ -727,7 +727,7 @@ printf("Time for DFn3F1: %g seconds \n", time);
      r2h11z = r2h11z + r2h11y;
      i2h11z = i2h11z + i2h11y;
 #ifdef D_DBG_SMALLTIMES
-time = (*(SPfrontEnd->IFseconds))();
+time = SPfrontEnd->IFseconds();
 #endif
      temp = - ckt->CKTomega *
          D1i3F1(here->capbx2,
@ -744,7 +744,7 @@ time = (*(SPfrontEnd->IFseconds))();
      r2h11z,
      i2h11z);
 #ifdef D_DBG_SMALLTIMES
-time = (*(SPfrontEnd->IFseconds))() - time;
+time = SPfrontEnd->IFseconds() - time;
 printf("Time for D1n3F1: %g seconds \n", time);
 #endif

@ -874,7 +874,7 @@ printf("Time for D1n3F1: %g seconds \n", time);
      /* loading ib term */
      /* x and y still the same */
 #ifdef D_DBG_SMALLTIMES
-time = (*(SPfrontEnd->IFseconds))();
+time = SPfrontEnd->IFseconds();
 #endif
      temp = DFnF12( here->ib_x2,
      here->ib_y2,
@ -914,7 +914,7 @@ time = (*(SPfrontEnd->IFseconds))();
      0.0,
      0.0);
 #ifdef D_DBG_SMALLTIMES
-time = (*(SPfrontEnd->IFseconds))() - time;
+time = SPfrontEnd->IFseconds() - time;
 printf("Time for DFnF12: %g seconds \n", time);
 #endif

@ -1044,7 +1044,7 @@ printf("Time for DFnF12: %g seconds \n", time);
      r1h2z = r1h2z + r1h2y;
      i1h2z = i1h2z + i1h2y;
 #ifdef D_DBG_SMALLTIMES
-time = (*(SPfrontEnd->IFseconds))();
+time = SPfrontEnd->IFseconds();
 #endif
      temp = - ckt->CKTomega *
          D1iF12(here->capbx2,
@ -1059,7 +1059,7 @@ time = (*(SPfrontEnd->IFseconds))();
      r1h2z,
      i1h2z);
 #ifdef D_DBG_SMALLTIMES
-time = (*(SPfrontEnd->IFseconds))() - time;
+time = SPfrontEnd->IFseconds() - time;
 printf("Time for D1nF12: %g seconds \n", time);
 #endif

@ -1471,14 +1471,14 @@ printf("Time for D1nF12: %g seconds \n", time);
        pass.h2f1f2z =  r2h1m2z;
        pass.ih2f1f2z =   i2h1m2z;
 #ifdef D_DBG_SMALLTIMES
-time = (*(SPfrontEnd->IFseconds))();
+time = SPfrontEnd->IFseconds();
 #endif
        temp = DFn2F12(&pass);


        itemp = DFi2F12(&pass);
 #ifdef D_DBG_SMALLTIMES
-time = (*(SPfrontEnd->IFseconds))() - time;
+time = SPfrontEnd->IFseconds() - time;
 printf("Time for DFn2F12: %g seconds \n", time);
 #endif
      }
@ -1693,7 +1693,7 @@ printf("Time for DFn2F12: %g seconds \n", time);
      r2h1m2z = r2h1m2z + r2h1m2y;
      i2h1m2z = i2h1m2z + i2h1m2y;
 #ifdef D_DBG_SMALLTIMES
-time = (*(SPfrontEnd->IFseconds))();
+time = SPfrontEnd->IFseconds();
 #endif
      temp = - ckt->CKTomega *
          D1i2F12(here->capbx2,
@ -1718,7 +1718,7 @@ time = (*(SPfrontEnd->IFseconds))();
      r2h1m2z,
      i2h1m2z);
 #ifdef D_DBG_SMALLTIMES
-time = (*(SPfrontEnd->IFseconds))() - time;
+time = SPfrontEnd->IFseconds() - time;
 printf("Time for D1n2F12: %g seconds \n", time);
 #endif

--- a/src/spicelib/devices/bjt2/bjt2noise.c
+++ b/src/spicelib/devices/bjt2/bjt2noise.c
@ -70,7 +70,7 @@ BJT2noise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt,

 			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);
 				/* we've added one more plot */
@ -84,7 +84,7 @@ BJT2noise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt,

 			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);
 				/* we've added one more plot */
@ -94,7 +94,7 @@ BJT2noise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt,

 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);
 				/* we've added one more plot */
--- a/src/spicelib/devices/bjt2/bjt2temp.c
+++ b/src/spicelib/devices/bjt2/bjt2temp.c
@ -114,7 +114,7 @@ BJT2temp(GENmodel *inModel, CKTcircuit *ckt)
        if(model->BJT2depletionCapCoeffGiven) {
            if(model->BJT2depletionCapCoeff>.9999)  {
                model->BJT2depletionCapCoeff=.9999;
-                (*(SPfrontEnd->IFerror))(ERR_WARNING,
+                SPfrontEnd->IFerror (ERR_WARNING,
                        "BJT2 model %s, parameter fc limited to 0.9999",
                        &(model->BJT2modName));
            }
--- a/src/spicelib/devices/bsim1/b1noi.c
+++ b/src/spicelib/devices/bsim1/b1noi.c
@ -65,7 +65,7 @@ B1noise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt,

 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);
 				/* we've added one more plot */
@ -81,7 +81,7 @@ if (!data->namelist) return(E_NOMEM);

 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);
 				/* we've added one more plot */
@ -92,7 +92,7 @@ if (!data->namelist) return(E_NOMEM);

 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);
 				/* we've added one more plot */
--- a/src/spicelib/devices/bsim1/b1temp.c
+++ b/src/spicelib/devices/bsim1/b1temp.c
@ -54,7 +54,7 @@ B1temp(GENmodel *inModel, CKTcircuit *ckt)
                IFuid namarray[2];
                namarray[0] = model->B1modName;
                namarray[1] = here->B1name;
-                (*(SPfrontEnd->IFerror))(ERR_FATAL,
+                SPfrontEnd->IFerror (ERR_FATAL,
                    "B1: mosfet %s, model %s: Effective channel length <=0",
                    namarray);
                return(E_BADPARM);
@ -63,7 +63,7 @@ B1temp(GENmodel *inModel, CKTcircuit *ckt)
                IFuid namarray[2];
                namarray[0] = model->B1modName;
                namarray[1] = here->B1name;
-                (*(SPfrontEnd->IFerror))(ERR_FATAL,
+                SPfrontEnd->IFerror (ERR_FATAL,
                    "B1: mosfet %s, model %s: Effective channel width <=0",
                    namarray);
                return(E_BADPARM);
--- a/src/spicelib/devices/bsim2/b2noi.c
+++ b/src/spicelib/devices/bsim2/b2noi.c
@ -65,7 +65,7 @@ B2noise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt,

 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);
 				/* we've added one more plot */
@ -81,7 +81,7 @@ if (!data->namelist) return(E_NOMEM);

 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);
 				/* we've added one more plot */
@ -92,7 +92,7 @@ if (!data->namelist) return(E_NOMEM);

 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);
 				/* we've added one more plot */
--- a/src/spicelib/devices/bsim2/b2temp.c
+++ b/src/spicelib/devices/bsim2/b2temp.c
@ -84,7 +84,7 @@ B2temp(GENmodel *inModel, CKTcircuit *ckt)
 		{  IFuid namarray[2];
                   namarray[0] = model->B2modName;
                   namarray[1] = here->B2name;
-                   (*(SPfrontEnd->IFerror))(ERR_FATAL,
+                   SPfrontEnd->IFerror (ERR_FATAL,
                    "B2: mosfet %s, model %s: Effective channel length <=0",
                    namarray);
                   return(E_BADPARM);
@ -94,7 +94,7 @@ B2temp(GENmodel *inModel, CKTcircuit *ckt)
 		{  IFuid namarray[2];
                   namarray[0] = model->B2modName;
                   namarray[1] = here->B2name;
-                   (*(SPfrontEnd->IFerror))(ERR_FATAL,
+                   SPfrontEnd->IFerror (ERR_FATAL,
                    "B2: mosfet %s, model %s: Effective channel width <=0",
                    namarray);
                   return(E_BADPARM);
--- a/src/spicelib/devices/bsim3/b3noi.c
+++ b/src/spicelib/devices/bsim3/b3noi.c
@ -157,7 +157,7 @@ int i;
                                       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);
@ -172,7 +172,7 @@ int i;
                                       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);
@ -184,7 +184,7 @@ int i;
                                       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);
--- a/src/spicelib/devices/bsim3/b3temp.c
+++ b/src/spicelib/devices/bsim3/b3temp.c
@ -198,7 +198,7 @@ int Size_Not_Found;
 	          {   IFuid namarray[2];
                      namarray[0] = model->BSIM3modName;
                      namarray[1] = here->BSIM3name;
-                      (*(SPfrontEnd->IFerror))(ERR_FATAL,
+                      SPfrontEnd->IFerror (ERR_FATAL,
                      "BSIM3: mosfet %s, model %s: Effective channel length <= 0",
                       namarray);
                      return(E_BADPARM);
@ -209,7 +209,7 @@ int Size_Not_Found;
 	          {   IFuid namarray[2];
                      namarray[0] = model->BSIM3modName;
                      namarray[1] = here->BSIM3name;
-                      (*(SPfrontEnd->IFerror))(ERR_FATAL,
+                      SPfrontEnd->IFerror (ERR_FATAL,
                      "BSIM3: mosfet %s, model %s: Effective channel width <= 0",
                       namarray);
                      return(E_BADPARM);
@ -220,7 +220,7 @@ int Size_Not_Found;
 	          {   IFuid namarray[2];
                      namarray[0] = model->BSIM3modName;
                      namarray[1] = here->BSIM3name;
-                      (*(SPfrontEnd->IFerror))(ERR_FATAL,
+                      SPfrontEnd->IFerror (ERR_FATAL,
                      "BSIM3: mosfet %s, model %s: Effective channel length for C-V <= 0",
                       namarray);
                      return(E_BADPARM);
@ -231,7 +231,7 @@ int Size_Not_Found;
 	          {   IFuid namarray[2];
                      namarray[0] = model->BSIM3modName;
                      namarray[1] = here->BSIM3name;
-                      (*(SPfrontEnd->IFerror))(ERR_FATAL,
+                      SPfrontEnd->IFerror (ERR_FATAL,
                      "BSIM3: mosfet %s, model %s: Effective channel width for C-V <= 0",
                       namarray);
                      return(E_BADPARM);
@ -610,7 +610,7 @@ int Size_Not_Found;
 		  {   IFuid namarray[2];
                      namarray[0] = model->BSIM3modName;
                      namarray[1] = here->BSIM3name;
-                      (*(SPfrontEnd->IFerror)) (ERR_FATAL, "Fatal error(s) detected during BSIM3V3.2 parameter checking for %s in model %s", namarray);
+                      SPfrontEnd->IFerror (ERR_FATAL, "Fatal error(s) detected during BSIM3V3.2 parameter checking for %s in model %s", namarray);
                      return(E_BADPARM);   
 		  }

--- a/src/spicelib/devices/bsim3soi/b4soinoi.c
+++ b/src/spicelib/devices/bsim3soi/b4soinoi.c
@ -166,7 +166,7 @@ int i;
                                       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);
@ -181,7 +181,7 @@ int i;
                                       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);
@ -193,7 +193,7 @@ int i;
                                       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);
--- a/src/spicelib/devices/bsim3soi/b4soitemp.c
+++ b/src/spicelib/devices/bsim3soi/b4soitemp.c
@ -233,7 +233,7 @@ B4SOItemp(
 	    {   IFuid namarray[2];
 		namarray[0] = model->B4SOImodName;
 		namarray[1] = here->B4SOIname;
-		(*(SPfrontEnd->IFerror))(ERR_FATAL,
+		SPfrontEnd->IFerror (ERR_FATAL,
 					 "B4SOI: mosfet %s, model %s: Effective channel length <= 0",
 					 namarray);
 		return(E_BADPARM);
@ -246,7 +246,7 @@ B4SOItemp(
 	    {   IFuid namarray[2];
 		namarray[0] = model->B4SOImodName;
 		namarray[1] = here->B4SOIname;
-		(*(SPfrontEnd->IFerror))(ERR_FATAL,
+		SPfrontEnd->IFerror (ERR_FATAL,
 					 "B4SOI: mosfet %s, model %s: Effective channel width <= 0",
 					 namarray);
 		return(E_BADPARM);
@ -262,7 +262,7 @@ B4SOItemp(
 	    {   IFuid namarray[2];
 		namarray[0] = model->B4SOImodName;
 		namarray[1] = here->B4SOIname;
-		(*(SPfrontEnd->IFerror))(ERR_FATAL,
+		SPfrontEnd->IFerror (ERR_FATAL,
 					 "B4SOI: mosfet %s, model %s: Effective channel length for C-V <= 0",
 					 namarray);
 		return(E_BADPARM);
@ -275,7 +275,7 @@ B4SOItemp(
 	    {   IFuid namarray[2];
 		namarray[0] = model->B4SOImodName;
 		namarray[1] = here->B4SOIname;
-		(*(SPfrontEnd->IFerror))(ERR_FATAL,
+		SPfrontEnd->IFerror (ERR_FATAL,
 					 "B4SOI: mosfet %s, model %s: Effective channel width for C-V <= 0",
 					 namarray);
 		return(E_BADPARM);
@ -293,7 +293,7 @@ B4SOItemp(
 		IFuid namarray[2];
 		namarray[0] = model->B4SOImodName;
 		namarray[1] = here->B4SOIname;
-		(*(SPfrontEnd->IFerror))(ERR_FATAL,
+		SPfrontEnd->IFerror (ERR_FATAL,
 					 "B4SOI: mosfet %s, model %s: Effective channel length for C-V (body) <= 0",
 					 namarray);
 		return(E_BADPARM);
@ -305,7 +305,7 @@ B4SOItemp(
 		IFuid namarray[2];
 		namarray[0] = model->B4SOImodName;
 		namarray[1] = here->B4SOIname;
-		(*(SPfrontEnd->IFerror))(ERR_FATAL,
+		SPfrontEnd->IFerror (ERR_FATAL,
 					 "B4SOI: mosfet %s, model %s: Effective channel length for C-V (backgate) <= 0",
 					 namarray);
 		return(E_BADPARM);
@ -1190,7 +1190,7 @@ B4SOItemp(
 	    {   IFuid namarray[2];
 		namarray[0] = model->B4SOImodName;
 		namarray[1] = here->B4SOIname;
-		(*(SPfrontEnd->IFerror)) (ERR_FATAL, "Fatal error(s) detected during B4SOIV3 parameter checking for %s in model %s", namarray);
+		SPfrontEnd->IFerror (ERR_FATAL, "Fatal error(s) detected during B4SOIV3 parameter checking for %s in model %s", namarray);
 		return(E_BADPARM);
 	    }

--- a/src/spicelib/devices/bsim3soi_dd/b3soiddnoi.c
+++ b/src/spicelib/devices/bsim3soi_dd/b3soiddnoi.c
@ -150,7 +150,7 @@ int i;
                                       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);
@ -165,7 +165,7 @@ int i;
                                       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);
@ -177,7 +177,7 @@ int i;
                                       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);
--- a/src/spicelib/devices/bsim3soi_dd/b3soiddtemp.c
+++ b/src/spicelib/devices/bsim3soi_dd/b3soiddtemp.c
@ -132,7 +132,7 @@ int Size_Not_Found;
 	          {   IFuid namarray[2];
                      namarray[0] = model->B3SOIDDmodName;
                      namarray[1] = here->B3SOIDDname;
-                      (*(SPfrontEnd->IFerror))(ERR_FATAL,
+                      SPfrontEnd->IFerror (ERR_FATAL,
                      "B3SOIDD: mosfet %s, model %s: Effective channel length <= 0",
                       namarray);
                      return(E_BADPARM);
@ -143,7 +143,7 @@ int Size_Not_Found;
 	          {   IFuid namarray[2];
                      namarray[0] = model->B3SOIDDmodName;
                      namarray[1] = here->B3SOIDDname;
-                      (*(SPfrontEnd->IFerror))(ERR_FATAL,
+                      SPfrontEnd->IFerror (ERR_FATAL,
                      "B3SOIDD: mosfet %s, model %s: Effective channel width <= 0",
                       namarray);
                      return(E_BADPARM);
@ -154,7 +154,7 @@ int Size_Not_Found;
 	          {   IFuid namarray[2];
                      namarray[0] = model->B3SOIDDmodName;
                      namarray[1] = here->B3SOIDDname;
-                      (*(SPfrontEnd->IFerror))(ERR_FATAL,
+                      SPfrontEnd->IFerror (ERR_FATAL,
                      "B3SOIDD: mosfet %s, model %s: Effective channel length for C-V <= 0",
                       namarray);
                      return(E_BADPARM);
@ -165,7 +165,7 @@ int Size_Not_Found;
 	          {   IFuid namarray[2];
                      namarray[0] = model->B3SOIDDmodName;
                      namarray[1] = here->B3SOIDDname;
-                      (*(SPfrontEnd->IFerror))(ERR_FATAL,
+                      SPfrontEnd->IFerror (ERR_FATAL,
                      "B3SOIDD: mosfet %s, model %s: Effective channel width for C-V <= 0",
                       namarray);
                      return(E_BADPARM);
@ -560,7 +560,7 @@ int Size_Not_Found;
 		  {   IFuid namarray[2];
                      namarray[0] = model->B3SOIDDmodName;
                      namarray[1] = here->B3SOIDDname;
-                      (*(SPfrontEnd->IFerror)) (ERR_FATAL, "Fatal error(s) detected during B3SOIDDV3 parameter checking for %s in model %s", namarray);
+                      SPfrontEnd->IFerror (ERR_FATAL, "Fatal error(s) detected during B3SOIDDV3 parameter checking for %s in model %s", namarray);
                      return(E_BADPARM);   
 		  }

--- a/src/spicelib/devices/bsim3soi_fd/b3soifdnoi.c
+++ b/src/spicelib/devices/bsim3soi_fd/b3soifdnoi.c
@ -150,7 +150,7 @@ int i;
                                       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);
@ -165,7 +165,7 @@ int i;
                                       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);
@ -177,7 +177,7 @@ int i;
                                       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);
--- a/src/spicelib/devices/bsim3soi_fd/b3soifdtemp.c
+++ b/src/spicelib/devices/bsim3soi_fd/b3soifdtemp.c
@ -131,7 +131,7 @@ int Size_Not_Found;
 	          {   IFuid namarray[2];
                      namarray[0] = model->B3SOIFDmodName;
                      namarray[1] = here->B3SOIFDname;
-                      (*(SPfrontEnd->IFerror))(ERR_FATAL,
+                      SPfrontEnd->IFerror (ERR_FATAL,
                      "B3SOIFD: mosfet %s, model %s: Effective channel length <= 0",
                       namarray);
                      return(E_BADPARM);
@ -142,7 +142,7 @@ int Size_Not_Found;
 	          {   IFuid namarray[2];
                      namarray[0] = model->B3SOIFDmodName;
                      namarray[1] = here->B3SOIFDname;
-                      (*(SPfrontEnd->IFerror))(ERR_FATAL,
+                      SPfrontEnd->IFerror (ERR_FATAL,
                      "B3SOIFD: mosfet %s, model %s: Effective channel width <= 0",
                       namarray);
                      return(E_BADPARM);
@ -153,7 +153,7 @@ int Size_Not_Found;
 	          {   IFuid namarray[2];
                      namarray[0] = model->B3SOIFDmodName;
                      namarray[1] = here->B3SOIFDname;
-                      (*(SPfrontEnd->IFerror))(ERR_FATAL,
+                      SPfrontEnd->IFerror (ERR_FATAL,
                      "B3SOIFD: mosfet %s, model %s: Effective channel length for C-V <= 0",
                       namarray);
                      return(E_BADPARM);
@ -164,7 +164,7 @@ int Size_Not_Found;
 	          {   IFuid namarray[2];
                      namarray[0] = model->B3SOIFDmodName;
                      namarray[1] = here->B3SOIFDname;
-                      (*(SPfrontEnd->IFerror))(ERR_FATAL,
+                      SPfrontEnd->IFerror (ERR_FATAL,
                      "B3SOIFD: mosfet %s, model %s: Effective channel width for C-V <= 0",
                       namarray);
                      return(E_BADPARM);
@ -559,7 +559,7 @@ int Size_Not_Found;
 		  {   IFuid namarray[2];
                      namarray[0] = model->B3SOIFDmodName;
                      namarray[1] = here->B3SOIFDname;
-                      (*(SPfrontEnd->IFerror)) (ERR_FATAL, "Fatal error(s) detected during B3SOIFDV3 parameter checking for %s in model %s", namarray);
+                      SPfrontEnd->IFerror (ERR_FATAL, "Fatal error(s) detected during B3SOIFDV3 parameter checking for %s in model %s", namarray);
                      return(E_BADPARM);   
 		  }

--- a/src/spicelib/devices/bsim3soi_pd/b3soipdnoi.c
+++ b/src/spicelib/devices/bsim3soi_pd/b3soipdnoi.c
@ -154,7 +154,7 @@ int i;
                                       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);
@ -169,7 +169,7 @@ int i;
                                       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);
@ -181,7 +181,7 @@ int i;
                                       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);
--- a/src/spicelib/devices/bsim3soi_pd/b3soipdtemp.c
+++ b/src/spicelib/devices/bsim3soi_pd/b3soipdtemp.c
@ -161,7 +161,7 @@ double tmp3, T7;
 	          {   IFuid namarray[2];
                      namarray[0] = model->B3SOIPDmodName;
                      namarray[1] = here->B3SOIPDname;
-                      (*(SPfrontEnd->IFerror))(ERR_FATAL,
+                      SPfrontEnd->IFerror (ERR_FATAL,
                      "B3SOIPD: mosfet %s, model %s: Effective channel length <= 0",
                       namarray);
                      return(E_BADPARM);
@ -173,7 +173,7 @@ double tmp3, T7;
 	          {   IFuid namarray[2];
                      namarray[0] = model->B3SOIPDmodName;
                      namarray[1] = here->B3SOIPDname;
-                      (*(SPfrontEnd->IFerror))(ERR_FATAL,
+                      SPfrontEnd->IFerror (ERR_FATAL,
                      "B3SOIPD: mosfet %s, model %s: Effective channel width <= 0",
                       namarray);
                      return(E_BADPARM);
@ -187,7 +187,7 @@ double tmp3, T7;
 	          {   IFuid namarray[2];
                      namarray[0] = model->B3SOIPDmodName;
                      namarray[1] = here->B3SOIPDname;
-                      (*(SPfrontEnd->IFerror))(ERR_FATAL,
+                      SPfrontEnd->IFerror (ERR_FATAL,
                      "B3SOIPD: mosfet %s, model %s: Effective channel length for C-V <= 0",
                       namarray);
                      return(E_BADPARM);
@ -199,7 +199,7 @@ double tmp3, T7;
 	          {   IFuid namarray[2];
                      namarray[0] = model->B3SOIPDmodName;
                      namarray[1] = here->B3SOIPDname;
-                      (*(SPfrontEnd->IFerror))(ERR_FATAL,
+                      SPfrontEnd->IFerror (ERR_FATAL,
                      "B3SOIPD: mosfet %s, model %s: Effective channel width for C-V <= 0",
                       namarray);
                      return(E_BADPARM);
@ -214,7 +214,7 @@ double tmp3, T7;
                     IFuid namarray[2];
                     namarray[0] = model->B3SOIPDmodName;
                     namarray[1] = here->B3SOIPDname;
-                     (*(SPfrontEnd->IFerror))(ERR_FATAL,
+                     SPfrontEnd->IFerror (ERR_FATAL,
                     "B3SOIPD: mosfet %s, model %s: Effective channel length for C-V (body) <= 0",
                     namarray);
                     return(E_BADPARM);
@ -226,7 +226,7 @@ double tmp3, T7;
                     IFuid namarray[2];
                     namarray[0] = model->B3SOIPDmodName;
                     namarray[1] = here->B3SOIPDname;
-                     (*(SPfrontEnd->IFerror))(ERR_FATAL,
+                     SPfrontEnd->IFerror (ERR_FATAL,
                     "B3SOIPD: mosfet %s, model %s: Effective channel length for C-V (backgate) <= 0",
                     namarray);
                     return(E_BADPARM);
@ -673,7 +673,7 @@ double tmp3, T7;
 		  {   IFuid namarray[2];
                      namarray[0] = model->B3SOIPDmodName;
                      namarray[1] = here->B3SOIPDname;
-                      (*(SPfrontEnd->IFerror)) (ERR_FATAL, "Fatal error(s) detected during B3SOIPDV3 parameter checking for %s in model %s", namarray);
+                      SPfrontEnd->IFerror (ERR_FATAL, "Fatal error(s) detected during B3SOIPDV3 parameter checking for %s in model %s", namarray);
                      return(E_BADPARM);   
 		  }

--- a/src/spicelib/devices/bsim3v0/b3v0noi.c
+++ b/src/spicelib/devices/bsim3v0/b3v0noi.c
@ -123,7 +123,7 @@ int i;
                                       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);
@ -138,7 +138,7 @@ int i;
                                       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);
@ -150,7 +150,7 @@ int i;
                                       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);
--- a/src/spicelib/devices/bsim3v0/b3v0temp.c
+++ b/src/spicelib/devices/bsim3v0/b3v0temp.c
@ -101,7 +101,7 @@ int Size_Not_Found;
 	          {   IFuid namarray[2];
                      namarray[0] = model->BSIM3v0modName;
                      namarray[1] = here->BSIM3v0name;
-                      (*(SPfrontEnd->IFerror))(ERR_FATAL,
+                      SPfrontEnd->IFerror (ERR_FATAL,
                      "BSIM3v0: mosfet %s, model %s: Effective channel length <= 0",
                       namarray);
                      return(E_BADPARM);
@ -112,7 +112,7 @@ int Size_Not_Found;
 	          {   IFuid namarray[2];
                      namarray[0] = model->BSIM3v0modName;
                      namarray[1] = here->BSIM3v0name;
-                      (*(SPfrontEnd->IFerror))(ERR_FATAL,
+                      SPfrontEnd->IFerror (ERR_FATAL,
                      "BSIM3v0: mosfet %s, model %s: Effective channel width <= 0",
                       namarray);
                      return(E_BADPARM);
@ -123,7 +123,7 @@ int Size_Not_Found;
 	          {   IFuid namarray[2];
                      namarray[0] = model->BSIM3v0modName;
                      namarray[1] = here->BSIM3v0name;
-                      (*(SPfrontEnd->IFerror))(ERR_FATAL,
+                      SPfrontEnd->IFerror (ERR_FATAL,
                      "BSIM3v0: mosfet %s, model %s: Effective channel length for C-V <= 0",
                       namarray);
                      return(E_BADPARM);
@ -134,7 +134,7 @@ int Size_Not_Found;
 	          {   IFuid namarray[2];
                      namarray[0] = model->BSIM3v0modName;
                      namarray[1] = here->BSIM3v0name;
-                      (*(SPfrontEnd->IFerror))(ERR_FATAL,
+                      SPfrontEnd->IFerror (ERR_FATAL,
                      "BSIM3v0: mosfet %s, model %s: Effective channel width for C-V <= 0",
                       namarray);
                      return(E_BADPARM);
--- a/src/spicelib/devices/bsim3v1/b3v1noi.c
+++ b/src/spicelib/devices/bsim3v1/b3v1noi.c
@ -148,7 +148,7 @@ int i;
 						      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);
@ -165,7 +165,7 @@ int i;
 						      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);
@ -179,7 +179,7 @@ int i;
 						      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);
--- a/src/spicelib/devices/bsim3v1/b3v1temp.c
+++ b/src/spicelib/devices/bsim3v1/b3v1temp.c
@ -143,7 +143,7 @@ int Size_Not_Found;
 	          {   IFuid namarray[2];
                      namarray[0] = model->BSIM3v1modName;
                      namarray[1] = here->BSIM3v1name;
-                      (*(SPfrontEnd->IFerror))(ERR_FATAL,
+                      SPfrontEnd->IFerror (ERR_FATAL,
                      "BSIM3v1: mosfet %s, model %s: Effective channel length <= 0",
                       namarray);
                      return(E_BADPARM);
@ -154,7 +154,7 @@ int Size_Not_Found;
 	          {   IFuid namarray[2];
                      namarray[0] = model->BSIM3v1modName;
                      namarray[1] = here->BSIM3v1name;
-                      (*(SPfrontEnd->IFerror))(ERR_FATAL,
+                      SPfrontEnd->IFerror (ERR_FATAL,
                      "BSIM3v1: mosfet %s, model %s: Effective channel width <= 0",
                       namarray);
                      return(E_BADPARM);
@ -165,7 +165,7 @@ int Size_Not_Found;
 	          {   IFuid namarray[2];
                      namarray[0] = model->BSIM3v1modName;
                      namarray[1] = here->BSIM3v1name;
-                      (*(SPfrontEnd->IFerror))(ERR_FATAL,
+                      SPfrontEnd->IFerror (ERR_FATAL,
                      "BSIM3v1: mosfet %s, model %s: Effective channel length for C-V <= 0",
                       namarray);
                      return(E_BADPARM);
@ -176,7 +176,7 @@ int Size_Not_Found;
 	          {   IFuid namarray[2];
                      namarray[0] = model->BSIM3v1modName;
                      namarray[1] = here->BSIM3v1name;
-                      (*(SPfrontEnd->IFerror))(ERR_FATAL,
+                      SPfrontEnd->IFerror (ERR_FATAL,
                      "BSIM3v1: mosfet %s, model %s: Effective channel width for C-V <= 0",
                       namarray);
                      return(E_BADPARM);
@ -530,7 +530,7 @@ int Size_Not_Found;
 		  {   IFuid namarray[2];
                      namarray[0] = model->BSIM3v1modName;
                      namarray[1] = here->BSIM3v1name;
-                      (*(SPfrontEnd->IFerror)) (ERR_FATAL, "Fatal error(s) detected during BSIM3V3.1 parameter checking for %s in model %s", namarray);
+                      SPfrontEnd->IFerror (ERR_FATAL, "Fatal error(s) detected during BSIM3V3.1 parameter checking for %s in model %s", namarray);
                      return(E_BADPARM);   
 		  }

--- a/src/spicelib/devices/bsim3v32/b3v32noi.c
+++ b/src/spicelib/devices/bsim3v32/b3v32noi.c
@ -226,7 +226,7 @@ int i;
                                       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);
@ -241,7 +241,7 @@ int i;
                                       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);
@ -253,7 +253,7 @@ int i;
                                       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);
--- a/src/spicelib/devices/bsim3v32/b3v32temp.c
+++ b/src/spicelib/devices/bsim3v32/b3v32temp.c
@ -267,7 +267,7 @@ int Size_Not_Found;
 	          {   IFuid namarray[2];
                      namarray[0] = model->BSIM3v32modName;
                      namarray[1] = here->BSIM3v32name;
-                      (*(SPfrontEnd->IFerror))(ERR_FATAL,
+                      SPfrontEnd->IFerror (ERR_FATAL,
                      "BSIM3v32: mosfet %s, model %s: Effective channel length <= 0",
                       namarray);
                      return(E_BADPARM);
@ -278,7 +278,7 @@ int Size_Not_Found;
 	          {   IFuid namarray[2];
                      namarray[0] = model->BSIM3v32modName;
                      namarray[1] = here->BSIM3v32name;
-                      (*(SPfrontEnd->IFerror))(ERR_FATAL,
+                      SPfrontEnd->IFerror (ERR_FATAL,
                      "BSIM3v32: mosfet %s, model %s: Effective channel width <= 0",
                       namarray);
                      return(E_BADPARM);
@ -289,7 +289,7 @@ int Size_Not_Found;
 	          {   IFuid namarray[2];
                      namarray[0] = model->BSIM3v32modName;
                      namarray[1] = here->BSIM3v32name;
-                      (*(SPfrontEnd->IFerror))(ERR_FATAL,
+                      SPfrontEnd->IFerror (ERR_FATAL,
                      "BSIM3v32: mosfet %s, model %s: Effective channel length for C-V <= 0",
                       namarray);
                      return(E_BADPARM);
@ -300,7 +300,7 @@ int Size_Not_Found;
 	          {   IFuid namarray[2];
                      namarray[0] = model->BSIM3v32modName;
                      namarray[1] = here->BSIM3v32name;
-                      (*(SPfrontEnd->IFerror))(ERR_FATAL,
+                      SPfrontEnd->IFerror (ERR_FATAL,
                      "BSIM3v32: mosfet %s, model %s: Effective channel width for C-V <= 0",
                       namarray);
                      return(E_BADPARM);
@ -679,7 +679,7 @@ int Size_Not_Found;
 		  {   IFuid namarray[2];
                      namarray[0] = model->BSIM3v32modName;
                      namarray[1] = here->BSIM3v32name;
-                      (*(SPfrontEnd->IFerror)) (ERR_FATAL, "Fatal error(s) detected during BSIM3v32V3.2 parameter checking for %s in model %s", namarray);
+                      SPfrontEnd->IFerror (ERR_FATAL, "Fatal error(s) detected during BSIM3v32V3.2 parameter checking for %s in model %s", namarray);
                      return(E_BADPARM);   
 		  }

--- a/src/spicelib/devices/bsim4/b4noi.c
+++ b/src/spicelib/devices/bsim4/b4noi.c
@ -138,7 +138,7 @@ int i;
                                       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);
@ -153,7 +153,7 @@ int i;
                                       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);
@ -165,7 +165,7 @@ int i;
                                       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);
--- a/src/spicelib/devices/bsim4/b4temp.c
+++ b/src/spicelib/devices/bsim4/b4temp.c
@ -447,7 +447,7 @@ int Size_Not_Found, i;
 	          {   IFuid namarray[2];
                      namarray[0] = model->BSIM4modName;
                      namarray[1] = here->BSIM4name;
-                      (*(SPfrontEnd->IFerror))(ERR_FATAL,
+                      SPfrontEnd->IFerror (ERR_FATAL,
                      "BSIM4: mosfet %s, model %s: Effective channel length <= 0",
                       namarray);
                      return(E_BADPARM);
@ -458,7 +458,7 @@ int Size_Not_Found, i;
 	          {   IFuid namarray[2];
                      namarray[0] = model->BSIM4modName;
                      namarray[1] = here->BSIM4name;
-                      (*(SPfrontEnd->IFerror))(ERR_FATAL,
+                      SPfrontEnd->IFerror (ERR_FATAL,
                      "BSIM4: mosfet %s, model %s: Effective channel width <= 0",
                       namarray);
                      return(E_BADPARM);
@ -469,7 +469,7 @@ int Size_Not_Found, i;
 	          {   IFuid namarray[2];
                      namarray[0] = model->BSIM4modName;
                      namarray[1] = here->BSIM4name;
-                      (*(SPfrontEnd->IFerror))(ERR_FATAL,
+                      SPfrontEnd->IFerror (ERR_FATAL,
                      "BSIM4: mosfet %s, model %s: Effective channel length for C-V <= 0",
                       namarray);
                      return(E_BADPARM);
@ -480,7 +480,7 @@ int Size_Not_Found, i;
 	          {   IFuid namarray[2];
                      namarray[0] = model->BSIM4modName;
                      namarray[1] = here->BSIM4name;
-                      (*(SPfrontEnd->IFerror))(ERR_FATAL,
+                      SPfrontEnd->IFerror (ERR_FATAL,
                      "BSIM4: mosfet %s, model %s: Effective channel width for C-V <= 0",
                       namarray);
                      return(E_BADPARM);
@ -491,7 +491,7 @@ int Size_Not_Found, i;
                  {   IFuid namarray[2];
                      namarray[0] = model->BSIM4modName;
                      namarray[1] = here->BSIM4name;
-                      (*(SPfrontEnd->IFerror))(ERR_FATAL,
+                      SPfrontEnd->IFerror (ERR_FATAL,
                      "BSIM4: mosfet %s, model %s: Effective channel width for S/D junctions <= 0",
                       namarray);
                      return(E_BADPARM);
@ -2191,7 +2191,7 @@ int Size_Not_Found, i;
              {   IFuid namarray[2];
                  namarray[0] = model->BSIM4modName;
                  namarray[1] = here->BSIM4name;
-                  (*(SPfrontEnd->IFerror)) (ERR_FATAL, "Fatal error(s) detected during BSIM4.6.4 parameter checking for %s in model %s", namarray);
+                  SPfrontEnd->IFerror (ERR_FATAL, "Fatal error(s) detected during BSIM4.6.4 parameter checking for %s in model %s", namarray);
                  return(E_BADPARM);
              }
         } /* End instance */
--- a/src/spicelib/devices/bsim4v2/b4v2noi.c
+++ b/src/spicelib/devices/bsim4v2/b4v2noi.c
@ -132,7 +132,7 @@ int i;
                                       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);
@ -147,7 +147,7 @@ int i;
                                       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);
@ -159,7 +159,7 @@ int i;
                                       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);
--- a/src/spicelib/devices/bsim4v2/b4v2temp.c
+++ b/src/spicelib/devices/bsim4v2/b4v2temp.c
@ -378,7 +378,7 @@ int Size_Not_Found;
 	          {   IFuid namarray[2];
                      namarray[0] = model->BSIM4v2modName;
                      namarray[1] = here->BSIM4v2name;
-                      (*(SPfrontEnd->IFerror))(ERR_FATAL,
+                      SPfrontEnd->IFerror (ERR_FATAL,
                      "BSIM4v2: mosfet %s, model %s: Effective channel length <= 0",
                       namarray);
                      return(E_BADPARM);
@ -389,7 +389,7 @@ int Size_Not_Found;
 	          {   IFuid namarray[2];
                      namarray[0] = model->BSIM4v2modName;
                      namarray[1] = here->BSIM4v2name;
-                      (*(SPfrontEnd->IFerror))(ERR_FATAL,
+                      SPfrontEnd->IFerror (ERR_FATAL,
                      "BSIM4v2: mosfet %s, model %s: Effective channel width <= 0",
                       namarray);
                      return(E_BADPARM);
@ -400,7 +400,7 @@ int Size_Not_Found;
 	          {   IFuid namarray[2];
                      namarray[0] = model->BSIM4v2modName;
                      namarray[1] = here->BSIM4v2name;
-                      (*(SPfrontEnd->IFerror))(ERR_FATAL,
+                      SPfrontEnd->IFerror (ERR_FATAL,
                      "BSIM4v2: mosfet %s, model %s: Effective channel length for C-V <= 0",
                       namarray);
                      return(E_BADPARM);
@ -411,7 +411,7 @@ int Size_Not_Found;
 	          {   IFuid namarray[2];
                      namarray[0] = model->BSIM4v2modName;
                      namarray[1] = here->BSIM4v2name;
-                      (*(SPfrontEnd->IFerror))(ERR_FATAL,
+                      SPfrontEnd->IFerror (ERR_FATAL,
                      "BSIM4v2: mosfet %s, model %s: Effective channel width for C-V <= 0",
                       namarray);
                      return(E_BADPARM);
@ -422,7 +422,7 @@ int Size_Not_Found;
                  {   IFuid namarray[2];
                      namarray[0] = model->BSIM4v2modName;
                      namarray[1] = here->BSIM4v2name;
-                      (*(SPfrontEnd->IFerror))(ERR_FATAL,
+                      SPfrontEnd->IFerror (ERR_FATAL,
                      "BSIM4v2: mosfet %s, model %s: Effective channel width for S/D junctions <= 0",
                       namarray);
                      return(E_BADPARM);
@ -1488,7 +1488,7 @@ int Size_Not_Found;
              {   IFuid namarray[2];
                  namarray[0] = model->BSIM4v2modName;
                  namarray[1] = here->BSIM4v2name;
-                  (*(SPfrontEnd->IFerror)) (ERR_FATAL, "Fatal error(s) detected during BSIM4v2.2.1 parameter checking for %s in model %s", namarray);
+                  SPfrontEnd->IFerror (ERR_FATAL, "Fatal error(s) detected during BSIM4v2.2.1 parameter checking for %s in model %s", namarray);
                  return(E_BADPARM);
              }
         } /* End instance */
--- a/src/spicelib/devices/bsim4v3/b4v3noi.c
+++ b/src/spicelib/devices/bsim4v3/b4v3noi.c
@ -134,7 +134,7 @@ int i;
                                       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);
@ -149,7 +149,7 @@ int i;
                                       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);
@ -161,7 +161,7 @@ int i;
                                       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);
--- a/src/spicelib/devices/bsim4v3/b4v3temp.c
+++ b/src/spicelib/devices/bsim4v3/b4v3temp.c
@ -386,7 +386,7 @@ int Size_Not_Found, i;
 	          {   IFuid namarray[2];
                      namarray[0] = model->BSIM4v3modName;
                      namarray[1] = here->BSIM4v3name;
-                      (*(SPfrontEnd->IFerror))(ERR_FATAL,
+                      SPfrontEnd->IFerror (ERR_FATAL,
                      "BSIM4v3: mosfet %s, model %s: Effective channel length <= 0",
                       namarray);
                      return(E_BADPARM);
@ -397,7 +397,7 @@ int Size_Not_Found, i;
 	          {   IFuid namarray[2];
                      namarray[0] = model->BSIM4v3modName;
                      namarray[1] = here->BSIM4v3name;
-                      (*(SPfrontEnd->IFerror))(ERR_FATAL,
+                      SPfrontEnd->IFerror (ERR_FATAL,
                      "BSIM4v3: mosfet %s, model %s: Effective channel width <= 0",
                       namarray);
                      return(E_BADPARM);
@ -408,7 +408,7 @@ int Size_Not_Found, i;
 	          {   IFuid namarray[2];
                      namarray[0] = model->BSIM4v3modName;
                      namarray[1] = here->BSIM4v3name;
-                      (*(SPfrontEnd->IFerror))(ERR_FATAL,
+                      SPfrontEnd->IFerror (ERR_FATAL,
                      "BSIM4v3: mosfet %s, model %s: Effective channel length for C-V <= 0",
                       namarray);
                      return(E_BADPARM);
@ -419,7 +419,7 @@ int Size_Not_Found, i;
 	          {   IFuid namarray[2];
                      namarray[0] = model->BSIM4v3modName;
                      namarray[1] = here->BSIM4v3name;
-                      (*(SPfrontEnd->IFerror))(ERR_FATAL,
+                      SPfrontEnd->IFerror (ERR_FATAL,
                      "BSIM4v3: mosfet %s, model %s: Effective channel width for C-V <= 0",
                       namarray);
                      return(E_BADPARM);
@ -430,7 +430,7 @@ int Size_Not_Found, i;
                  {   IFuid namarray[2];
                      namarray[0] = model->BSIM4v3modName;
                      namarray[1] = here->BSIM4v3name;
-                      (*(SPfrontEnd->IFerror))(ERR_FATAL,
+                      SPfrontEnd->IFerror (ERR_FATAL,
                      "BSIM4v3: mosfet %s, model %s: Effective channel width for S/D junctions <= 0",
                       namarray);
                      return(E_BADPARM);
@ -1637,7 +1637,7 @@ int Size_Not_Found, i;
              {   IFuid namarray[2];
                  namarray[0] = model->BSIM4v3modName;
                  namarray[1] = here->BSIM4v3name;
-                  (*(SPfrontEnd->IFerror)) (ERR_FATAL, "Fatal error(s) detected during BSIM4v3.3.0 parameter checking for %s in model %s", namarray);
+                  SPfrontEnd->IFerror (ERR_FATAL, "Fatal error(s) detected during BSIM4v3.3.0 parameter checking for %s in model %s", namarray);
                  return(E_BADPARM);
              }
         } /* End instance */
--- a/src/spicelib/devices/bsim4v4/b4v4noi.c
+++ b/src/spicelib/devices/bsim4v4/b4v4noi.c
@ -135,7 +135,7 @@ int i;
                                       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);
@ -150,7 +150,7 @@ int i;
                                       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);
@ -162,7 +162,7 @@ int i;
                                       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);
--- a/src/spicelib/devices/bsim4v4/b4v4temp.c
+++ b/src/spicelib/devices/bsim4v4/b4v4temp.c
@ -396,7 +396,7 @@ int Size_Not_Found, i;
 	          {   IFuid namarray[2];
                      namarray[0] = model->BSIM4v4modName;
                      namarray[1] = here->BSIM4v4name;
-                      (*(SPfrontEnd->IFerror))(ERR_FATAL,
+                      SPfrontEnd->IFerror (ERR_FATAL,
                      "BSIM4v4: mosfet %s, model %s: Effective channel length <= 0",
                       namarray);
                      return(E_BADPARM);
@ -407,7 +407,7 @@ int Size_Not_Found, i;
 	          {   IFuid namarray[2];
                      namarray[0] = model->BSIM4v4modName;
                      namarray[1] = here->BSIM4v4name;
-                      (*(SPfrontEnd->IFerror))(ERR_FATAL,
+                      SPfrontEnd->IFerror (ERR_FATAL,
                      "BSIM4v4: mosfet %s, model %s: Effective channel width <= 0",
                       namarray);
                      return(E_BADPARM);
@ -418,7 +418,7 @@ int Size_Not_Found, i;
 	          {   IFuid namarray[2];
                      namarray[0] = model->BSIM4v4modName;
                      namarray[1] = here->BSIM4v4name;
-                      (*(SPfrontEnd->IFerror))(ERR_FATAL,
+                      SPfrontEnd->IFerror (ERR_FATAL,
                      "BSIM4v4: mosfet %s, model %s: Effective channel length for C-V <= 0",
 		      namarray);
 		      fprintf(stderr,"BSIM4v4: mosfet %s, model %s: Effective channel length for C-V <= 0 (Lnew - 2.0*BSIM4v4dlc == %g - 2.0*%g)\n",
@ -431,7 +431,7 @@ int Size_Not_Found, i;
 	          {   IFuid namarray[2];
                      namarray[0] = model->BSIM4v4modName;
                      namarray[1] = here->BSIM4v4name;
-                      (*(SPfrontEnd->IFerror))(ERR_FATAL,
+                      SPfrontEnd->IFerror (ERR_FATAL,
                      "BSIM4v4: mosfet %s, model %s: Effective channel width for C-V <= 0",
                       namarray);
                      return(E_BADPARM);
@ -442,7 +442,7 @@ int Size_Not_Found, i;
                  {   IFuid namarray[2];
                      namarray[0] = model->BSIM4v4modName;
                      namarray[1] = here->BSIM4v4name;
-                      (*(SPfrontEnd->IFerror))(ERR_FATAL,
+                      SPfrontEnd->IFerror (ERR_FATAL,
                      "BSIM4v4: mosfet %s, model %s: Effective channel width for S/D junctions <= 0",
                       namarray);
                      return(E_BADPARM);
@ -1695,7 +1695,7 @@ int Size_Not_Found, i;
              {   IFuid namarray[2];
                  namarray[0] = model->BSIM4v4modName;
                  namarray[1] = here->BSIM4v4name;
-                  (*(SPfrontEnd->IFerror)) (ERR_FATAL, "Fatal error(s) detected during BSIM4.4.0 parameter checking for %s in model %s", namarray);
+                  SPfrontEnd->IFerror (ERR_FATAL, "Fatal error(s) detected during BSIM4.4.0 parameter checking for %s in model %s", namarray);
                  return(E_BADPARM);
              }
         } /* End instance */
--- a/src/spicelib/devices/bsim4v5/b4v5noi.c
+++ b/src/spicelib/devices/bsim4v5/b4v5noi.c
@ -137,7 +137,7 @@ int i;
                                       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);
@ -152,7 +152,7 @@ int i;
                                       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);
@ -164,7 +164,7 @@ int i;
                                       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);
--- a/src/spicelib/devices/bsim4v5/b4v5temp.c
+++ b/src/spicelib/devices/bsim4v5/b4v5temp.c
@ -399,7 +399,7 @@ int Size_Not_Found, i;
 	          {   IFuid namarray[2];
                      namarray[0] = model->BSIM4v5modName;
                      namarray[1] = here->BSIM4v5name;
-                      (*(SPfrontEnd->IFerror))(ERR_FATAL,
+                      SPfrontEnd->IFerror (ERR_FATAL,
                      "BSIM4v5: mosfet %s, model %s: Effective channel length <= 0",
                       namarray);
                      return(E_BADPARM);
@ -410,7 +410,7 @@ int Size_Not_Found, i;
 	          {   IFuid namarray[2];
                      namarray[0] = model->BSIM4v5modName;
                      namarray[1] = here->BSIM4v5name;
-                      (*(SPfrontEnd->IFerror))(ERR_FATAL,
+                      SPfrontEnd->IFerror (ERR_FATAL,
                      "BSIM4v5: mosfet %s, model %s: Effective channel width <= 0",
                       namarray);
                      return(E_BADPARM);
@ -421,7 +421,7 @@ int Size_Not_Found, i;
 	          {   IFuid namarray[2];
                      namarray[0] = model->BSIM4v5modName;
                      namarray[1] = here->BSIM4v5name;
-                      (*(SPfrontEnd->IFerror))(ERR_FATAL,
+                      SPfrontEnd->IFerror (ERR_FATAL,
                      "BSIM4v5: mosfet %s, model %s: Effective channel length for C-V <= 0",
                       namarray);
                      return(E_BADPARM);
@ -432,7 +432,7 @@ int Size_Not_Found, i;
 	          {   IFuid namarray[2];
                      namarray[0] = model->BSIM4v5modName;
                      namarray[1] = here->BSIM4v5name;
-                      (*(SPfrontEnd->IFerror))(ERR_FATAL,
+                      SPfrontEnd->IFerror (ERR_FATAL,
                      "BSIM4v5: mosfet %s, model %s: Effective channel width for C-V <= 0",
                       namarray);
                      return(E_BADPARM);
@ -443,7 +443,7 @@ int Size_Not_Found, i;
                  {   IFuid namarray[2];
                      namarray[0] = model->BSIM4v5modName;
                      namarray[1] = here->BSIM4v5name;
-                      (*(SPfrontEnd->IFerror))(ERR_FATAL,
+                      SPfrontEnd->IFerror (ERR_FATAL,
                      "BSIM4v5: mosfet %s, model %s: Effective channel width for S/D junctions <= 0",
                       namarray);
                      return(E_BADPARM);
@ -1826,7 +1826,7 @@ int Size_Not_Found, i;
              {   IFuid namarray[2];
                  namarray[0] = model->BSIM4v5modName;
                  namarray[1] = here->BSIM4v5name;
-                  (*(SPfrontEnd->IFerror)) (ERR_FATAL, "Fatal error(s) detected during BSIM4v5.5.0 parameter checking for %s in model %s", namarray);
+                  SPfrontEnd->IFerror (ERR_FATAL, "Fatal error(s) detected during BSIM4v5.5.0 parameter checking for %s in model %s", namarray);
                  return(E_BADPARM);
              }
         } /* End instance */
--- a/src/spicelib/devices/cccs/cccsset.c
+++ b/src/spicelib/devices/cccs/cccsset.c
@ -38,7 +38,7 @@ CCCSsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states)
                IFuid namarray[2];
                namarray[0] = here->CCCSname;
                namarray[1] = here->CCCScontName;
-                (*(SPfrontEnd->IFerror))(ERR_FATAL,
+                SPfrontEnd->IFerror (ERR_FATAL,
                        "%s: unknown controlling source %s",namarray);
                return(E_BADPARM);
            }
--- a/src/spicelib/devices/ccvs/ccvsset.c
+++ b/src/spicelib/devices/ccvs/ccvsset.c
@ -32,7 +32,7 @@ CCVSsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states)
                here=here->CCVSnextInstance) {
            
            if(here->CCVSposNode == here->CCVSnegNode) {
-                (*(SPfrontEnd->IFerror))(ERR_FATAL,
+                SPfrontEnd->IFerror (ERR_FATAL,
                        "instance %s is a shorted CCVS", &here->CCVSname);
                return(E_UNSUPP);
            }
@ -47,7 +47,7 @@ CCVSsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states)
                IFuid namarray[2];
                namarray[0] = here->CCVSname;
                namarray[1] = here->CCVScontName;
-                (*(SPfrontEnd->IFerror))(ERR_FATAL,
+                SPfrontEnd->IFerror (ERR_FATAL,
                        "%s: unknown controlling source %s",namarray);
                return(E_BADPARM);
            }
--- a/src/spicelib/devices/cktaccept.c
+++ b/src/spicelib/devices/cktaccept.c
@ -30,8 +30,8 @@ CKTaccept(CKTcircuit *ckt)

    devs = devices();
    for (i = 0; i < DEVmaxnum; i++) {
-        if ( devs[i] && ((*devs[i]).DEVaccept != NULL) && (ckt->CKThead[i] != NULL) ){
-            error = (*((*devs[i]).DEVaccept))(ckt,ckt->CKThead[i]);
+        if ( devs[i] && devs[i]->DEVaccept && ckt->CKThead[i] ) {
+            error = devs[i]->DEVaccept (ckt, ckt->CKThead[i]);
            if (error)
 		return(error);
        }
--- a/src/spicelib/devices/cktask.c
+++ b/src/spicelib/devices/cktask.c
@ -27,7 +27,7 @@ CKTask(CKTcircuit *ckt, GENinstance *fast, int which, IFvalue *value, IFvalue *s
    SPICEdev **DEVices;

    DEVices = devices();
-    if((*DEVices[type]).DEVask) {
+    if(DEVices[type]->DEVask) {
        error = DEVices[type]->DEVask(ckt,
                fast, which, value, selector);
    } else {
--- a/src/spicelib/devices/cktbindnode.c
+++ b/src/spicelib/devices/cktbindnode.c
@ -26,7 +26,7 @@ CKTbindNode(CKTcircuit *ckt, GENinstance *fast, int term, CKTnode *node)
    devs = devices();
    mappednode = node->number;

-    if (*((*devs[type]).DEVpublic.terms) >= term && term >0 ) {
+    if (*(devs[type]->DEVpublic.terms) >= term && term > 0) {
        switch(term) {
            default:
 		return E_NOTERM;