diff --git a/src/spicelib/devices/bsim3/b3temp.c b/src/spicelib/devices/bsim3/b3temp.c
index a04d80c02..06da08818 100644
--- a/src/spicelib/devices/bsim3/b3temp.c
+++ b/src/spicelib/devices/bsim3/b3temp.c
@@ -28,9 +28,6 @@
 #define EXP_THRESHOLD 34.0
 #define Charge_q 1.60219e-19
 
-extern SPICEanalysis *analInfo[];
-extern SPICEanalysis SENSinfo;
-
 /* ARGSUSED */
 int
 BSIM3temp(
@@ -658,17 +655,17 @@ int Size_Not_Found;
                   if (model->BSIM3k1Given || model->BSIM3k2Given)
                   {   if (!model->BSIM3k1Given)
                       {
-                          if((!ckt->CKTcurJob) || (analInfo[ckt->CKTcurJob->JOBtype] != &SENSinfo))
+                          if ((!ckt->CKTcurJob) || (ckt->CKTcurJob->JOBtype < 9)) /* don't print in sensitivity */
                               fprintf(stdout, "Warning: k1 should be specified with k2.\n");
                           pParam->BSIM3k1 = 0.53;
                       }
                       if (!model->BSIM3k2Given)
-                      {   
-                          if((!ckt->CKTcurJob) || (analInfo[ckt->CKTcurJob->JOBtype] != &SENSinfo))
+                      {
+                          if ((!ckt->CKTcurJob) || (ckt->CKTcurJob->JOBtype < 9)) /* don't print in sensitivity */
                               fprintf(stdout, "Warning: k2 should be specified with k1.\n");
                           pParam->BSIM3k2 = -0.0186;
                       }
-                      if((!ckt->CKTcurJob) || (analInfo[ckt->CKTcurJob->JOBtype] != &SENSinfo)) {
+                      if ((!ckt->CKTcurJob) || (ckt->CKTcurJob->JOBtype < 9)) { /* don't print in sensitivity */
                           if (model->BSIM3nsubGiven)
                               fprintf(stdout, "Warning: nsub is ignored because k1 or k2 is given.\n");
                           if (model->BSIM3xtGiven)
diff --git a/src/spicelib/devices/bsim3v32/b3v32temp.c b/src/spicelib/devices/bsim3v32/b3v32temp.c
index 16a094be6..771499e10 100644
--- a/src/spicelib/devices/bsim3v32/b3v32temp.c
+++ b/src/spicelib/devices/bsim3v32/b3v32temp.c
@@ -27,9 +27,6 @@
 #define EXP_THRESHOLD 34.0
 #define Charge_q 1.60219e-19
 
-extern SPICEanalysis *analInfo[];
-extern SPICEanalysis SENSinfo;
-
 /* ARGSUSED */
 int
 BSIM3v32temp (GENmodel *inModel, CKTcircuit *ckt)
@@ -727,17 +724,17 @@ int Size_Not_Found;
                   if (model->BSIM3v32k1Given || model->BSIM3v32k2Given)
                   {   if (!model->BSIM3v32k1Given)
                       {
-                          if((!ckt->CKTcurJob) || (analInfo[ckt->CKTcurJob->JOBtype] != &SENSinfo))
+                          if ((!ckt->CKTcurJob) || (ckt->CKTcurJob->JOBtype < 9)) /* don't print in sensitivity */
                               fprintf(stdout, "Warning: k1 should be specified with k2.\n");
                           pParam->BSIM3v32k1 = 0.53;
                       }
                       if (!model->BSIM3v32k2Given)
                       {
-                          if((!ckt->CKTcurJob) || (analInfo[ckt->CKTcurJob->JOBtype] != &SENSinfo))
+                          if ((!ckt->CKTcurJob) || (ckt->CKTcurJob->JOBtype < 9)) /* don't print in sensitivity */
                               fprintf(stdout, "Warning: k2 should be specified with k1.\n");
                           pParam->BSIM3v32k2 = -0.0186;
                       }
-                      if((!ckt->CKTcurJob) || (analInfo[ckt->CKTcurJob->JOBtype] != &SENSinfo)) {
+                      if ((!ckt->CKTcurJob) || (ckt->CKTcurJob->JOBtype < 9)) { /* don't print in sensitivity */
                           if (model->BSIM3v32nsubGiven)
                               fprintf(stdout, "Warning: nsub is ignored because k1 or k2 is given.\n");
                           if (model->BSIM3v32xtGiven)
diff --git a/src/spicelib/devices/bsim4/b4temp.c b/src/spicelib/devices/bsim4/b4temp.c
index 83e0692d3..a7398b4b0 100644
--- a/src/spicelib/devices/bsim4/b4temp.c
+++ b/src/spicelib/devices/bsim4/b4temp.c
@@ -29,9 +29,6 @@
 #include "sperror.h"
 #include "suffix.h"
 
-extern SPICEanalysis *analInfo[];
-extern SPICEanalysis SENSinfo;
-
 #define Kb 1.3806226e-23
 #define KboQ 8.617087e-5 
 #define EPS0 8.85418e-12
@@ -1286,17 +1283,17 @@ int Size_Not_Found, i;
                   if (model->BSIM4k1Given || model->BSIM4k2Given)
                   {   if (!model->BSIM4k1Given)
                       {
-                          if((!ckt->CKTcurJob) || (analInfo[ckt->CKTcurJob->JOBtype] != &SENSinfo))
+                          if ((!ckt->CKTcurJob) || (ckt->CKTcurJob->JOBtype < 9)) /* don't print in sensitivity */
                               fprintf(stdout, "Warning: k1 should be specified with k2.\n");
                           pParam->BSIM4k1 = 0.53;
                       }
                       if (!model->BSIM4k2Given)
                       {
-                          if((!ckt->CKTcurJob) || (analInfo[ckt->CKTcurJob->JOBtype] != &SENSinfo))
+                          if ((!ckt->CKTcurJob) || (ckt->CKTcurJob->JOBtype < 9)) /* don't print in sensitivity */
                               fprintf(stdout, "Warning: k2 should be specified with k1.\n");
                           pParam->BSIM4k2 = -0.0186;
                       }
-                      if((!ckt->CKTcurJob) || (analInfo[ckt->CKTcurJob->JOBtype] != &SENSinfo)) {
+                      if ((!ckt->CKTcurJob) || (ckt->CKTcurJob->JOBtype < 9)) { /* don't print in sensitivity */
                           if (model->BSIM4nsubGiven)
                               fprintf(stdout, "Warning: nsub is ignored because k1 or k2 is given.\n");
                           if (model->BSIM4xtGiven)
diff --git a/src/spicelib/devices/bsim4v5/b4v5temp.c b/src/spicelib/devices/bsim4v5/b4v5temp.c
index 99f8b9a34..29f4233ee 100644
--- a/src/spicelib/devices/bsim4v5/b4v5temp.c
+++ b/src/spicelib/devices/bsim4v5/b4v5temp.c
@@ -22,9 +22,6 @@
 #include "sperror.h"
 #include "suffix.h"
 
-extern SPICEanalysis *analInfo[];
-extern SPICEanalysis SENSinfo;
-
 #define Kb 1.3806226e-23
 #define KboQ 8.617087e-5 
 #define EPS0 8.85418e-12
@@ -1163,17 +1160,17 @@ int Size_Not_Found, i;
                   if (model->BSIM4v5k1Given || model->BSIM4v5k2Given)
                   {   if (!model->BSIM4v5k1Given)
                       {
-                          if((!ckt->CKTcurJob) || (analInfo[ckt->CKTcurJob->JOBtype] != &SENSinfo))
+                          if ((!ckt->CKTcurJob) || (ckt->CKTcurJob->JOBtype < 9)) /* don't print in sensitivity */
                               fprintf(stdout, "Warning: k1 should be specified with k2.\n");
                           pParam->BSIM4v5k1 = 0.53;
                       }
                       if (!model->BSIM4v5k2Given)
                       {
-                          if((!ckt->CKTcurJob) || (analInfo[ckt->CKTcurJob->JOBtype] != &SENSinfo))
+                          if ((!ckt->CKTcurJob) || (ckt->CKTcurJob->JOBtype < 9)) /* don't print in sensitivity */
                               fprintf(stdout, "Warning: k2 should be specified with k1.\n");
                           pParam->BSIM4v5k2 = -0.0186;
                       }
-                      if((!ckt->CKTcurJob) || (analInfo[ckt->CKTcurJob->JOBtype] != &SENSinfo)) {
+                      if ((!ckt->CKTcurJob) || (ckt->CKTcurJob->JOBtype < 9)) { /* don't print in sensitivity */
                           if (model->BSIM4v5nsubGiven)
                               fprintf(stdout, "Warning: nsub is ignored because k1 or k2 is given.\n");
                           if (model->BSIM4v5xtGiven)