diff --git a/src/spicelib/devices/asrc/asrcinit.c b/src/spicelib/devices/asrc/asrcinit.c
index ec53efee8..ab1a23c77 100644
--- a/src/spicelib/devices/asrc/asrcinit.c
+++ b/src/spicelib/devices/asrc/asrcinit.c
@@ -18,6 +18,8 @@ SPICEdev ASRCinfo = {
         .instanceParms = ASRCpTable,
         .numModelParms = NULL,
         .modelParms = NULL,
+        .flags = DEV_DEFAULT,
+
 #ifdef XSPICE
         .cm_func = NULL,
         .num_conn = 0,
@@ -27,8 +29,8 @@ SPICEdev ASRCinfo = {
         .num_inst_var = 0,
         .inst_var = NULL,
 #endif
-        .flags = DEV_DEFAULT,
     },
+
     .DEVparam = ASRCparam,
     .DEVmodParam = NULL,
     .DEVload = ASRCload,
@@ -57,12 +59,13 @@ SPICEdev ASRCinfo = {
     .DEVdisto = NULL,
     .DEVnoise = NULL,
     .DEVsoaCheck = NULL,
+    .DEVinstSize = &ASRCiSize,
+    .DEVmodSize = &ASRCmSize,
+
 #ifdef CIDER
     .DEVdump = NULL,
     .DEVacct = NULL,
 #endif
-    .DEVinstSize = &ASRCiSize,
-    .DEVmodSize = &ASRCmSize,
 };
 
 
diff --git a/src/spicelib/devices/bjt/bjtinit.c b/src/spicelib/devices/bjt/bjtinit.c
index 74ee6c625..aded3c9d2 100644
--- a/src/spicelib/devices/bjt/bjtinit.c
+++ b/src/spicelib/devices/bjt/bjtinit.c
@@ -18,6 +18,8 @@ SPICEdev BJTinfo = {
 	.instanceParms = BJTpTable,
 	.numModelParms = &BJTmPTSize,
 	.modelParms = BJTmPTable,
+	.flags = DEV_DEFAULT,
+
 #ifdef XSPICE
 	.cm_func = NULL,
 	.num_conn = 0,
@@ -27,8 +29,8 @@ SPICEdev BJTinfo = {
 	.num_inst_var = 0,
 	.inst_var = NULL,
 #endif
-	.flags = DEV_DEFAULT,
     },
+
     .DEVparam = BJTparam,
     .DEVmodParam = BJTmParam,
     .DEVload = BJTload,
@@ -57,12 +59,13 @@ SPICEdev BJTinfo = {
     .DEVdisto = BJTdisto,
     .DEVnoise = BJTnoise,
     .DEVsoaCheck = BJTsoaCheck,
+    .DEVinstSize = &BJTiSize,
+    .DEVmodSize = &BJTmSize,
+
 #ifdef CIDER
     .DEVdump = NULL,
     .DEVacct = NULL,
 #endif
-    .DEVinstSize = &BJTiSize,
-    .DEVmodSize = &BJTmSize,
 };
 
 
diff --git a/src/spicelib/devices/bsim1/bsim1init.c b/src/spicelib/devices/bsim1/bsim1init.c
index 0c4876cf3..416455477 100644
--- a/src/spicelib/devices/bsim1/bsim1init.c
+++ b/src/spicelib/devices/bsim1/bsim1init.c
@@ -18,6 +18,8 @@ SPICEdev B1info = {
         .instanceParms = B1pTable,
         .numModelParms = &B1mPTSize,
         .modelParms = B1mPTable,
+        .flags = DEV_DEFAULT,
+
 #ifdef XSPICE
         .cm_func = NULL,
         .num_conn = 0,
@@ -27,8 +29,8 @@ SPICEdev B1info = {
         .num_inst_var = 0,
         .inst_var = NULL,
 #endif
-        .flags = DEV_DEFAULT,
     },
+
     .DEVparam = B1param,
     .DEVmodParam = B1mParam,
     .DEVload = B1load,
@@ -57,12 +59,13 @@ SPICEdev B1info = {
     .DEVdisto = B1disto,
     .DEVnoise = B1noise,
     .DEVsoaCheck = NULL,
+    .DEVinstSize = &B1iSize,
+    .DEVmodSize = &B1mSize,
+
 #ifdef CIDER
     .DEVdump = NULL,
     .DEVacct = NULL,
 #endif
-    .DEVinstSize = &B1iSize,
-    .DEVmodSize = &B1mSize,
 };
 
 
diff --git a/src/spicelib/devices/bsim2/bsim2init.c b/src/spicelib/devices/bsim2/bsim2init.c
index 981625ac5..168a80e4b 100644
--- a/src/spicelib/devices/bsim2/bsim2init.c
+++ b/src/spicelib/devices/bsim2/bsim2init.c
@@ -18,6 +18,8 @@ SPICEdev B2info = {
         .instanceParms = B2pTable,
         .numModelParms = &B2mPTSize,
         .modelParms = B2mPTable,
+        .flags = DEV_DEFAULT,
+
 #ifdef XSPICE
         .cm_func = NULL,
         .num_conn = 0,
@@ -27,8 +29,8 @@ SPICEdev B2info = {
         .num_inst_var = 0,
         .inst_var = NULL,
 #endif
-        .flags = DEV_DEFAULT,
     },
+
     .DEVparam = B2param,
     .DEVmodParam = B2mParam,
     .DEVload = B2load,
@@ -57,12 +59,13 @@ SPICEdev B2info = {
     .DEVdisto = NULL,
     .DEVnoise = B2noise,
     .DEVsoaCheck = NULL,
+    .DEVinstSize = &B2iSize,
+    .DEVmodSize = &B2mSize,
+
 #ifdef CIDER
     .DEVdump = NULL,
     .DEVacct = NULL,
 #endif
-    .DEVinstSize = &B2iSize,
-    .DEVmodSize = &B2mSize,
 };
 
 
diff --git a/src/spicelib/devices/bsim3/bsim3init.c b/src/spicelib/devices/bsim3/bsim3init.c
index aed8390a6..420ec6f20 100644
--- a/src/spicelib/devices/bsim3/bsim3init.c
+++ b/src/spicelib/devices/bsim3/bsim3init.c
@@ -18,6 +18,8 @@ SPICEdev BSIM3info = {
         .instanceParms = BSIM3pTable,
         .numModelParms = &BSIM3mPTSize,
         .modelParms = BSIM3mPTable,
+        .flags = DEV_DEFAULT,
+
 #ifdef XSPICE
         .cm_func = NULL,
         .num_conn = 0,
@@ -27,8 +29,8 @@ SPICEdev BSIM3info = {
         .num_inst_var = 0,
         .inst_var = NULL,
 #endif
-        .flags = DEV_DEFAULT,
     },
+
     .DEVparam = BSIM3param,
     .DEVmodParam = BSIM3mParam,
     .DEVload = BSIM3load,
@@ -57,12 +59,13 @@ SPICEdev BSIM3info = {
     .DEVdisto = NULL,
     .DEVnoise = BSIM3noise,
     .DEVsoaCheck = BSIM3soaCheck,
+    .DEVinstSize = &BSIM3iSize,
+    .DEVmodSize = &BSIM3mSize,
+
 #ifdef CIDER
     .DEVdump = NULL,
     .DEVacct = NULL,
 #endif
-    .DEVinstSize = &BSIM3iSize,
-    .DEVmodSize = &BSIM3mSize,
 };
 
 
diff --git a/src/spicelib/devices/bsim3soi_dd/b3soiddinit.c b/src/spicelib/devices/bsim3soi_dd/b3soiddinit.c
index 9d3c048d1..82d618e9b 100644
--- a/src/spicelib/devices/bsim3soi_dd/b3soiddinit.c
+++ b/src/spicelib/devices/bsim3soi_dd/b3soiddinit.c
@@ -16,6 +16,8 @@ SPICEdev B3SOIDDinfo = {
         .instanceParms = B3SOIDDpTable,
         .numModelParms = &B3SOIDDmPTSize,
         .modelParms = B3SOIDDmPTable,
+        .flags = DEV_DEFAULT,
+
 #ifdef XSPICE
         .cm_func = NULL,
         .num_conn = 0,
@@ -25,8 +27,8 @@ SPICEdev B3SOIDDinfo = {
         .num_inst_var = 0,
         .inst_var = NULL,
 #endif
-        .flags = DEV_DEFAULT,
     },
+
     .DEVparam = B3SOIDDparam,
     .DEVmodParam = B3SOIDDmParam,
     .DEVload = B3SOIDDload,
@@ -55,12 +57,13 @@ SPICEdev B3SOIDDinfo = {
     .DEVdisto = NULL,
     .DEVnoise = B3SOIDDnoise,
     .DEVsoaCheck = NULL,
+    .DEVinstSize = &B3SOIDDiSize,
+    .DEVmodSize = &B3SOIDDmSize,
+
 #ifdef CIDER
     .DEVdump = NULL,
     .DEVacct = NULL,
 #endif
-    .DEVinstSize = &B3SOIDDiSize,
-    .DEVmodSize = &B3SOIDDmSize,
 };
 
 SPICEdev *
diff --git a/src/spicelib/devices/bsim3soi_fd/b3soifdinit.c b/src/spicelib/devices/bsim3soi_fd/b3soifdinit.c
index 115a3057a..88b5fafb5 100644
--- a/src/spicelib/devices/bsim3soi_fd/b3soifdinit.c
+++ b/src/spicelib/devices/bsim3soi_fd/b3soifdinit.c
@@ -16,6 +16,8 @@ SPICEdev B3SOIFDinfo = {
         .instanceParms = B3SOIFDpTable,
         .numModelParms = &B3SOIFDmPTSize,
         .modelParms = B3SOIFDmPTable,
+        .flags = DEV_DEFAULT,
+
 #ifdef XSPICE
         .cm_func = NULL,
         .num_conn = 0,
@@ -25,8 +27,8 @@ SPICEdev B3SOIFDinfo = {
         .num_inst_var = 0,
         .inst_var = NULL,
 #endif
-        .flags = DEV_DEFAULT,
     },
+
     .DEVparam = B3SOIFDparam,
     .DEVmodParam = B3SOIFDmParam,
     .DEVload = B3SOIFDload,
@@ -55,12 +57,13 @@ SPICEdev B3SOIFDinfo = {
     .DEVdisto = NULL,
     .DEVnoise = B3SOIFDnoise,
     .DEVsoaCheck = NULL,
+    .DEVinstSize = &B3SOIFDiSize,
+    .DEVmodSize = &B3SOIFDmSize,
+
 #ifdef CIDER
     .DEVdump = NULL,
     .DEVacct = NULL,
 #endif
-    .DEVinstSize = &B3SOIFDiSize,
-    .DEVmodSize = &B3SOIFDmSize,
 };
 
 
diff --git a/src/spicelib/devices/bsim3soi_pd/b3soipdinit.c b/src/spicelib/devices/bsim3soi_pd/b3soipdinit.c
index 121c55a14..43907ba23 100644
--- a/src/spicelib/devices/bsim3soi_pd/b3soipdinit.c
+++ b/src/spicelib/devices/bsim3soi_pd/b3soipdinit.c
@@ -17,6 +17,8 @@ SPICEdev B3SOIPDinfo = {
 	.instanceParms = B3SOIPDpTable,
 	.numModelParms = &B3SOIPDmPTSize,
 	.modelParms = B3SOIPDmPTable,
+	.flags = DEV_DEFAULT,
+
 #ifdef XSPICE
 	.cm_func = NULL,
 	.num_conn = 0,
@@ -26,8 +28,8 @@ SPICEdev B3SOIPDinfo = {
 	.num_inst_var = 0,
 	.inst_var = NULL,
 #endif
-	.flags = DEV_DEFAULT,
     },
+
     .DEVparam = B3SOIPDparam,
     .DEVmodParam = B3SOIPDmParam,
     .DEVload = B3SOIPDload,
@@ -56,12 +58,13 @@ SPICEdev B3SOIPDinfo = {
     .DEVdisto = NULL,
     .DEVnoise = B3SOIPDnoise,
     .DEVsoaCheck = NULL,
+    .DEVinstSize = &B3SOIPDiSize,
+    .DEVmodSize = &B3SOIPDmSize,
+
 #ifdef CIDER
     .DEVdump = NULL,
     .DEVacct = NULL,
 #endif
-    .DEVinstSize = &B3SOIPDiSize,
-    .DEVmodSize = &B3SOIPDmSize,
 };
 
 SPICEdev *
diff --git a/src/spicelib/devices/bsim3v0/bsim3v0init.c b/src/spicelib/devices/bsim3v0/bsim3v0init.c
index 30807a71a..0b673bca9 100644
--- a/src/spicelib/devices/bsim3v0/bsim3v0init.c
+++ b/src/spicelib/devices/bsim3v0/bsim3v0init.c
@@ -17,6 +17,8 @@ SPICEdev B3v0info = {
         .instanceParms = BSIM3v0pTable,
         .numModelParms = &BSIM3v0mPTSize,
         .modelParms = BSIM3v0mPTable,
+        .flags = DEV_DEFAULT,
+
 #ifdef XSPICE
         .cm_func = NULL,
         .num_conn = 0,
@@ -26,8 +28,8 @@ SPICEdev B3v0info = {
         .num_inst_var = 0,
         .inst_var = NULL,
 #endif
-        .flags = DEV_DEFAULT,
     },
+
     .DEVparam = BSIM3v0param,
     .DEVmodParam = BSIM3v0mParam,
     .DEVload = BSIM3v0load,
@@ -56,12 +58,13 @@ SPICEdev B3v0info = {
     .DEVdisto = NULL,
     .DEVnoise = BSIM3v0noise,
     .DEVsoaCheck = NULL,
+    .DEVinstSize = &BSIM3v0iSize,
+    .DEVmodSize = &BSIM3v0mSize,
+
 #ifdef CIDER
     .DEVdump = NULL,
     .DEVacct = NULL,
 #endif
-    .DEVinstSize = &BSIM3v0iSize,
-    .DEVmodSize = &BSIM3v0mSize,
 };
 
 
diff --git a/src/spicelib/devices/bsim3v1/bsim3v1init.c b/src/spicelib/devices/bsim3v1/bsim3v1init.c
index ffb0b194c..b290af7e2 100644
--- a/src/spicelib/devices/bsim3v1/bsim3v1init.c
+++ b/src/spicelib/devices/bsim3v1/bsim3v1init.c
@@ -17,6 +17,8 @@ SPICEdev BSIM3v1info = {
         .instanceParms = BSIM3v1pTable,
         .numModelParms = &BSIM3v1mPTSize,
         .modelParms = BSIM3v1mPTable,
+        .flags = DEV_DEFAULT,
+
 #ifdef XSPICE
         .cm_func = NULL,
         .num_conn = 0,
@@ -26,8 +28,8 @@ SPICEdev BSIM3v1info = {
         .num_inst_var = 0,
         .inst_var = NULL,
 #endif
-        .flags = DEV_DEFAULT,
     },
+
     .DEVparam = BSIM3v1param,
     .DEVmodParam = BSIM3v1mParam,
     .DEVload = BSIM3v1load,
@@ -56,12 +58,13 @@ SPICEdev BSIM3v1info = {
     .DEVdisto = NULL,
     .DEVnoise = BSIM3v1noise,
     .DEVsoaCheck = NULL,
+    .DEVinstSize = &BSIM3v1iSize,
+    .DEVmodSize = &BSIM3v1mSize,
+
 #ifdef CIDER
     .DEVdump = NULL,
     .DEVacct = NULL,
 #endif
-    .DEVinstSize = &BSIM3v1iSize,
-    .DEVmodSize = &BSIM3v1mSize,
 };
 
 
diff --git a/src/spicelib/devices/bsim3v32/bsim3v32init.c b/src/spicelib/devices/bsim3v32/bsim3v32init.c
index 0f4237d64..960d7fd81 100644
--- a/src/spicelib/devices/bsim3v32/bsim3v32init.c
+++ b/src/spicelib/devices/bsim3v32/bsim3v32init.c
@@ -18,6 +18,8 @@ SPICEdev BSIM3v32info = {
         .instanceParms = BSIM3v32pTable,
         .numModelParms = &BSIM3v32mPTSize,
         .modelParms = BSIM3v32mPTable,
+        .flags = DEV_DEFAULT,
+
 #ifdef XSPICE
         .cm_func = NULL,
         .num_conn = 0,
@@ -27,8 +29,8 @@ SPICEdev BSIM3v32info = {
         .num_inst_var = 0,
         .inst_var = NULL,
 #endif
-        .flags = DEV_DEFAULT,
     },
+
     .DEVparam = BSIM3v32param,
     .DEVmodParam = BSIM3v32mParam,
     .DEVload = BSIM3v32load,
@@ -57,12 +59,13 @@ SPICEdev BSIM3v32info = {
     .DEVdisto = NULL,
     .DEVnoise = BSIM3v32noise,
     .DEVsoaCheck = BSIM3v32soaCheck,
+    .DEVinstSize = &BSIM3v32iSize,
+    .DEVmodSize = &BSIM3v32mSize,
+
 #ifdef CIDER
     .DEVdump = NULL,
     .DEVacct = NULL,
 #endif
-    .DEVinstSize = &BSIM3v32iSize,
-    .DEVmodSize = &BSIM3v32mSize,
 };
 
 
diff --git a/src/spicelib/devices/bsim4/bsim4init.c b/src/spicelib/devices/bsim4/bsim4init.c
index 6cf088f39..fe03fb432 100644
--- a/src/spicelib/devices/bsim4/bsim4init.c
+++ b/src/spicelib/devices/bsim4/bsim4init.c
@@ -18,6 +18,8 @@ SPICEdev BSIM4info = {
         .instanceParms = BSIM4pTable,
         .numModelParms = &BSIM4mPTSize,
         .modelParms = BSIM4mPTable,
+        .flags = DEV_DEFAULT,
+
 #ifdef XSPICE
         .cm_func = NULL,
         .num_conn = 0,
@@ -27,8 +29,8 @@ SPICEdev BSIM4info = {
         .num_inst_var = 0,
         .inst_var = NULL,
 #endif
-        .flags = DEV_DEFAULT,
     },
+
     .DEVparam = BSIM4param,
     .DEVmodParam = BSIM4mParam,
     .DEVload = BSIM4load,
@@ -57,12 +59,13 @@ SPICEdev BSIM4info = {
     .DEVdisto = NULL,
     .DEVnoise = BSIM4noise,
     .DEVsoaCheck = BSIM4soaCheck,
+    .DEVinstSize = &BSIM4iSize,
+    .DEVmodSize = &BSIM4mSize,
+
 #ifdef CIDER
     .DEVdump = NULL,
     .DEVacct = NULL,
 #endif
-    .DEVinstSize = &BSIM4iSize,
-    .DEVmodSize = &BSIM4mSize,
 };
 
 
diff --git a/src/spicelib/devices/bsim4v5/bsim4v5init.c b/src/spicelib/devices/bsim4v5/bsim4v5init.c
index 1ccd18e69..8ac071444 100644
--- a/src/spicelib/devices/bsim4v5/bsim4v5init.c
+++ b/src/spicelib/devices/bsim4v5/bsim4v5init.c
@@ -18,6 +18,8 @@ SPICEdev BSIM4v5info = {
         .instanceParms = BSIM4v5pTable,
         .numModelParms = &BSIM4v5mPTSize,
         .modelParms = BSIM4v5mPTable,
+        .flags = DEV_DEFAULT,
+
 #ifdef XSPICE
         .cm_func = NULL,
         .num_conn = 0,
@@ -27,8 +29,8 @@ SPICEdev BSIM4v5info = {
         .num_inst_var = 0,
         .inst_var = NULL,
 #endif
-        .flags = DEV_DEFAULT,
     },
+
     .DEVparam = BSIM4v5param,
     .DEVmodParam = BSIM4v5mParam,
     .DEVload = BSIM4v5load,
@@ -57,12 +59,13 @@ SPICEdev BSIM4v5info = {
     .DEVdisto = NULL,
     .DEVnoise = BSIM4v5noise,
     .DEVsoaCheck = BSIM4v5soaCheck,
+    .DEVinstSize = &BSIM4v5iSize,
+    .DEVmodSize = &BSIM4v5mSize,
+
 #ifdef CIDER
     .DEVdump = NULL,
     .DEVacct = NULL,
 #endif
-    .DEVinstSize = &BSIM4v5iSize,
-    .DEVmodSize = &BSIM4v5mSize,
 };
 
 
diff --git a/src/spicelib/devices/bsim4v6/bsim4v6init.c b/src/spicelib/devices/bsim4v6/bsim4v6init.c
index e92aeba89..6e25377d4 100644
--- a/src/spicelib/devices/bsim4v6/bsim4v6init.c
+++ b/src/spicelib/devices/bsim4v6/bsim4v6init.c
@@ -18,6 +18,8 @@ SPICEdev BSIM4v6info = {
         .instanceParms = BSIM4v6pTable,
         .numModelParms = &BSIM4v6mPTSize,
         .modelParms = BSIM4v6mPTable,
+        .flags = DEV_DEFAULT,
+
 #ifdef XSPICE
         .cm_func = NULL,
         .num_conn = 0,
@@ -27,8 +29,8 @@ SPICEdev BSIM4v6info = {
         .num_inst_var = 0,
         .inst_var = NULL,
 #endif
-        .flags = DEV_DEFAULT,
     },
+
     .DEVparam = BSIM4v6param,
     .DEVmodParam = BSIM4v6mParam,
     .DEVload = BSIM4v6load,
@@ -57,12 +59,13 @@ SPICEdev BSIM4v6info = {
     .DEVdisto = NULL,
     .DEVnoise = BSIM4v6noise,
     .DEVsoaCheck = BSIM4v6soaCheck,
+    .DEVinstSize = &BSIM4v6iSize,
+    .DEVmodSize = &BSIM4v6mSize,
+
 #ifdef CIDER
     .DEVdump = NULL,
     .DEVacct = NULL,
 #endif
-    .DEVinstSize = &BSIM4v6iSize,
-    .DEVmodSize = &BSIM4v6mSize,
 };
 
 
diff --git a/src/spicelib/devices/bsim4v7/bsim4v7init.c b/src/spicelib/devices/bsim4v7/bsim4v7init.c
index 37eb8698f..72111f90b 100644
--- a/src/spicelib/devices/bsim4v7/bsim4v7init.c
+++ b/src/spicelib/devices/bsim4v7/bsim4v7init.c
@@ -18,6 +18,8 @@ SPICEdev BSIM4v7info = {
         .instanceParms = BSIM4v7pTable,
         .numModelParms = &BSIM4v7mPTSize,
         .modelParms = BSIM4v7mPTable,
+        .flags = DEV_DEFAULT,
+
 #ifdef XSPICE
         .cm_func = NULL,
         .num_conn = 0,
@@ -27,8 +29,8 @@ SPICEdev BSIM4v7info = {
         .num_inst_var = 0,
         .inst_var = NULL,
 #endif
-        .flags = DEV_DEFAULT,
     },
+
     .DEVparam = BSIM4v7param,
     .DEVmodParam = BSIM4v7mParam,
     .DEVload = BSIM4v7load,
@@ -57,12 +59,13 @@ SPICEdev BSIM4v7info = {
     .DEVdisto = NULL,
     .DEVnoise = BSIM4v7noise,
     .DEVsoaCheck = BSIM4v7soaCheck,
+    .DEVinstSize = &BSIM4v7iSize,
+    .DEVmodSize = &BSIM4v7mSize,
+
 #ifdef CIDER
     .DEVdump = NULL,
     .DEVacct = NULL,
 #endif
-    .DEVinstSize = &BSIM4v7iSize,
-    .DEVmodSize = &BSIM4v7mSize,
 };
 
 
diff --git a/src/spicelib/devices/bsimsoi/b4soiinit.c b/src/spicelib/devices/bsimsoi/b4soiinit.c
index f9b2f29d7..d1500241f 100644
--- a/src/spicelib/devices/bsimsoi/b4soiinit.c
+++ b/src/spicelib/devices/bsimsoi/b4soiinit.c
@@ -16,6 +16,8 @@ SPICEdev B4SOIinfo = {
         .instanceParms = B4SOIpTable,
         .numModelParms = &B4SOImPTSize,
         .modelParms = B4SOImPTable,
+        .flags = DEV_DEFAULT,
+
 #ifdef XSPICE
         .cm_func = NULL,
         .num_conn = 0,
@@ -25,8 +27,8 @@ SPICEdev B4SOIinfo = {
         .num_inst_var = 0,
         .inst_var = NULL,
 #endif
-        .flags = DEV_DEFAULT,
     },
+
     .DEVparam = B4SOIparam,
     .DEVmodParam = B4SOImParam,
     .DEVload = B4SOIload,
@@ -55,12 +57,13 @@ SPICEdev B4SOIinfo = {
     .DEVdisto = NULL,
     .DEVnoise = B4SOInoise,
     .DEVsoaCheck = B4SOIsoaCheck,
+    .DEVinstSize = &B4SOIiSize,
+    .DEVmodSize = &B4SOImSize,
+
 #ifdef CIDER
     .DEVdump = NULL,
     .DEVacct = NULL,
 #endif
-    .DEVinstSize = &B4SOIiSize,
-    .DEVmodSize = &B4SOImSize,
 };
 
 SPICEdev *
diff --git a/src/spicelib/devices/cap/capinit.c b/src/spicelib/devices/cap/capinit.c
index 5164cb6d2..b467bce5a 100644
--- a/src/spicelib/devices/cap/capinit.c
+++ b/src/spicelib/devices/cap/capinit.c
@@ -18,6 +18,8 @@ SPICEdev CAPinfo = {
         .instanceParms = CAPpTable,
         .numModelParms = &CAPmPTSize,
         .modelParms = CAPmPTable,
+        .flags = 0,
+
 #ifdef XSPICE
         .cm_func = NULL,
         .num_conn = 0,
@@ -27,8 +29,8 @@ SPICEdev CAPinfo = {
         .num_inst_var = 0,
         .inst_var = NULL,
 #endif
-        .flags = 0,
     },
+
     .DEVparam = CAPparam,
     .DEVmodParam = CAPmParam,
     .DEVload = CAPload,
@@ -57,12 +59,13 @@ SPICEdev CAPinfo = {
     .DEVdisto = NULL,
     .DEVnoise = NULL,
     .DEVsoaCheck = CAPsoaCheck,
+    .DEVinstSize = &CAPiSize,
+    .DEVmodSize = &CAPmSize,
+
 #ifdef CIDER
     .DEVdump = NULL,
     .DEVacct = NULL,
 #endif
-    .DEVinstSize = &CAPiSize,
-    .DEVmodSize = &CAPmSize,
 };
 
 
diff --git a/src/spicelib/devices/cccs/cccsinit.c b/src/spicelib/devices/cccs/cccsinit.c
index 9b619dc64..98be7bf4f 100644
--- a/src/spicelib/devices/cccs/cccsinit.c
+++ b/src/spicelib/devices/cccs/cccsinit.c
@@ -18,6 +18,8 @@ SPICEdev CCCSinfo = {
         .instanceParms = CCCSpTable,
         .numModelParms = NULL,
         .modelParms = NULL,
+        .flags = DEV_DEFAULT,
+
 #ifdef XSPICE
         .cm_func = NULL,
         .num_conn = 0,
@@ -27,8 +29,8 @@ SPICEdev CCCSinfo = {
         .num_inst_var = 0,
         .inst_var = NULL,
 #endif
-        .flags = DEV_DEFAULT,
     },
+
     .DEVparam = CCCSparam,
     .DEVmodParam = NULL,
     .DEVload = CCCSload,
@@ -57,12 +59,13 @@ SPICEdev CCCSinfo = {
     .DEVdisto = NULL,
     .DEVnoise = NULL,
     .DEVsoaCheck = NULL,
+    .DEVinstSize = &CCCSiSize,
+    .DEVmodSize = &CCCSmSize,
+
 #ifdef CIDER
     .DEVdump = NULL,
     .DEVacct = NULL,
 #endif
-    .DEVinstSize = &CCCSiSize,
-    .DEVmodSize = &CCCSmSize,
 };
 
 
diff --git a/src/spicelib/devices/ccvs/ccvsinit.c b/src/spicelib/devices/ccvs/ccvsinit.c
index 0bc766c93..e779e6fc1 100644
--- a/src/spicelib/devices/ccvs/ccvsinit.c
+++ b/src/spicelib/devices/ccvs/ccvsinit.c
@@ -18,6 +18,8 @@ SPICEdev CCVSinfo = {
         .instanceParms = CCVSpTable,
         .numModelParms = NULL,
         .modelParms = NULL,
+        .flags = DEV_DEFAULT,
+
 #ifdef XSPICE
         .cm_func = NULL,
         .num_conn = 0,
@@ -27,8 +29,8 @@ SPICEdev CCVSinfo = {
         .num_inst_var = 0,
         .inst_var = NULL,
 #endif
-        .flags = DEV_DEFAULT,
     },
+
     .DEVparam = CCVSparam,
     .DEVmodParam = NULL,
     .DEVload = CCVSload,
@@ -57,12 +59,13 @@ SPICEdev CCVSinfo = {
     .DEVdisto = NULL,
     .DEVnoise = NULL,
     .DEVsoaCheck = NULL,
+    .DEVinstSize = &CCVSiSize,
+    .DEVmodSize = &CCVSmSize,
+
 #ifdef CIDER
     .DEVdump = NULL,
     .DEVacct = NULL,
 #endif
-    .DEVinstSize = &CCVSiSize,
-    .DEVmodSize = &CCVSmSize,
 };
 
 
diff --git a/src/spicelib/devices/cpl/cplinit.c b/src/spicelib/devices/cpl/cplinit.c
index 32ccb5240..b4cacfd04 100644
--- a/src/spicelib/devices/cpl/cplinit.c
+++ b/src/spicelib/devices/cpl/cplinit.c
@@ -17,6 +17,8 @@ SPICEdev CPLinfo = {
 	.instanceParms = CPLpTable,
 	.numModelParms = &CPLmPTSize,
 	.modelParms = CPLmPTable,
+	.flags = 0,
+
 #ifdef XSPICE
 	.cm_func = NULL,
 	.num_conn = 0,
@@ -26,8 +28,8 @@ SPICEdev CPLinfo = {
 	.num_inst_var = 0,
 	.inst_var = NULL,
 #endif
-	.flags = 0,
     },
+
     .DEVparam = CPLparam,
     .DEVmodParam = CPLmParam,
     .DEVload = CPLload,
@@ -56,12 +58,13 @@ SPICEdev CPLinfo = {
     .DEVdisto = NULL,
     .DEVnoise = NULL,
     .DEVsoaCheck = NULL,
+    .DEVinstSize = &CPLiSize,
+    .DEVmodSize = &CPLmSize,
+
 #ifdef CIDER
     .DEVdump = NULL,
     .DEVacct = NULL,
 #endif
-    .DEVinstSize = &CPLiSize,
-    .DEVmodSize = &CPLmSize,
 };
 
 SPICEdev *
diff --git a/src/spicelib/devices/csw/cswinit.c b/src/spicelib/devices/csw/cswinit.c
index 06671d6ef..6a724dbc0 100644
--- a/src/spicelib/devices/csw/cswinit.c
+++ b/src/spicelib/devices/csw/cswinit.c
@@ -20,6 +20,8 @@ SPICEdev CSWinfo = {
         .instanceParms = CSWpTable,
         .numModelParms = &CSWmPTSize,
         .modelParms = CSWmPTable,
+        .flags = 0,
+
 #ifdef XSPICE
         .cm_func = NULL,
         .num_conn = 0,
@@ -29,8 +31,8 @@ SPICEdev CSWinfo = {
         .num_inst_var = 0,
         .inst_var = NULL,
 #endif
-        .flags = 0,
     },
+
     .DEVparam = CSWparam,
     .DEVmodParam = CSWmParam,
     .DEVload = CSWload,
@@ -59,12 +61,13 @@ SPICEdev CSWinfo = {
     .DEVdisto = NULL,
     .DEVnoise = CSWnoise,
     .DEVsoaCheck = NULL,
+    .DEVinstSize = &CSWiSize,
+    .DEVmodSize = &CSWmSize,
+
 #ifdef CIDER
     .DEVdump = NULL,
     .DEVacct = NULL,
 #endif
-    .DEVinstSize = &CSWiSize,
-    .DEVmodSize = &CSWmSize,
 };
 
 
diff --git a/src/spicelib/devices/dio/dioinit.c b/src/spicelib/devices/dio/dioinit.c
index 25d58f33d..64d64be7d 100644
--- a/src/spicelib/devices/dio/dioinit.c
+++ b/src/spicelib/devices/dio/dioinit.c
@@ -19,6 +19,8 @@ SPICEdev DIOinfo = {
         .instanceParms = DIOpTable,
         .numModelParms = &DIOmPTSize,
         .modelParms = DIOmPTable,
+        .flags = DEV_DEFAULT,
+
 #ifdef XSPICE
         .cm_func = NULL,
         .num_conn = 0,
@@ -28,8 +30,8 @@ SPICEdev DIOinfo = {
         .num_inst_var = 0,
         .inst_var = NULL,
 #endif
-        .flags = DEV_DEFAULT,
     },
+
     .DEVparam = DIOparam,
     .DEVmodParam = DIOmParam,
     .DEVload = DIOload,
@@ -58,12 +60,13 @@ SPICEdev DIOinfo = {
     .DEVdisto = DIOdisto,
     .DEVnoise = DIOnoise,
     .DEVsoaCheck = DIOsoaCheck,
+    .DEVinstSize = &DIOiSize,
+    .DEVmodSize = &DIOmSize,
+
 #ifdef CIDER
     .DEVdump = NULL,
     .DEVacct = NULL,
 #endif
-    .DEVinstSize = &DIOiSize,
-    .DEVmodSize = &DIOmSize,
 };
 
 
diff --git a/src/spicelib/devices/hfet1/hfetinit.c b/src/spicelib/devices/hfet1/hfetinit.c
index cf30a1acb..802eb0b00 100644
--- a/src/spicelib/devices/hfet1/hfetinit.c
+++ b/src/spicelib/devices/hfet1/hfetinit.c
@@ -18,6 +18,8 @@ SPICEdev HFETAinfo = {
         .instanceParms = HFETApTable,
         .numModelParms = &HFETAmPTSize,
         .modelParms = HFETAmPTable,
+        .flags = DEV_DEFAULT,
+
 #ifdef XSPICE
         .cm_func = NULL,
         .num_conn = 0,
@@ -27,8 +29,8 @@ SPICEdev HFETAinfo = {
         .num_inst_var = 0,
         .inst_var = NULL,
 #endif
-        .flags = DEV_DEFAULT,
     },
+
     .DEVparam = HFETAparam,
     .DEVmodParam = HFETAmParam,
     .DEVload = HFETAload,
@@ -57,12 +59,13 @@ SPICEdev HFETAinfo = {
     .DEVdisto = NULL,
     .DEVnoise = NULL,
     .DEVsoaCheck = NULL,
+    .DEVinstSize = &HFETAiSize,
+    .DEVmodSize = &HFETAmSize,
+
 #ifdef CIDER
     .DEVdump = NULL,
     .DEVacct = NULL,
 #endif
-    .DEVinstSize = &HFETAiSize,
-    .DEVmodSize = &HFETAmSize,
 };
 
 
diff --git a/src/spicelib/devices/hfet2/hfet2init.c b/src/spicelib/devices/hfet2/hfet2init.c
index 57267a6c0..1c8f3ca30 100644
--- a/src/spicelib/devices/hfet2/hfet2init.c
+++ b/src/spicelib/devices/hfet2/hfet2init.c
@@ -18,6 +18,8 @@ SPICEdev HFET2info = {
         .instanceParms = HFET2pTable,
         .numModelParms = &HFET2mPTSize,
         .modelParms = HFET2mPTable,
+        .flags = DEV_DEFAULT,
+
 #ifdef XSPICE
         .cm_func = NULL,
         .num_conn = 0,
@@ -27,8 +29,8 @@ SPICEdev HFET2info = {
         .num_inst_var = 0,
         .inst_var = NULL,
 #endif
-        .flags = DEV_DEFAULT,
     },
+
     .DEVparam = HFET2param,
     .DEVmodParam = HFET2mParam,
     .DEVload = HFET2load,
@@ -57,12 +59,13 @@ SPICEdev HFET2info = {
     .DEVdisto = NULL,
     .DEVnoise = NULL,
     .DEVsoaCheck = NULL,
+    .DEVinstSize = &HFET2iSize,
+    .DEVmodSize = &HFET2mSize,
+
 #ifdef CIDER
     .DEVdump = NULL,
     .DEVacct = NULL,
 #endif
-    .DEVinstSize = &HFET2iSize,
-    .DEVmodSize = &HFET2mSize,
 };
 
 
diff --git a/src/spicelib/devices/hisim2/hsm2init.c b/src/spicelib/devices/hisim2/hsm2init.c
index c6d5a9416..772db8a54 100644
--- a/src/spicelib/devices/hisim2/hsm2init.c
+++ b/src/spicelib/devices/hisim2/hsm2init.c
@@ -17,6 +17,8 @@ SPICEdev HSM2info = {
         .instanceParms = HSM2pTable,
         .numModelParms = &HSM2mPTSize,
         .modelParms = HSM2mPTable,
+        .flags = DEV_DEFAULT,
+
 #ifdef XSPICE
         .cm_func = NULL,
         .num_conn = 0,
@@ -26,8 +28,8 @@ SPICEdev HSM2info = {
         .num_inst_var = 0,
         .inst_var = NULL,
 #endif
-        .flags = DEV_DEFAULT,
     },
+
     .DEVparam = HSM2param,
     .DEVmodParam = HSM2mParam,
     .DEVload = HSM2load,
@@ -56,12 +58,13 @@ SPICEdev HSM2info = {
     .DEVdisto = NULL,
     .DEVnoise = HSM2noise,
     .DEVsoaCheck = HSM2soaCheck,
+    .DEVinstSize = &HSM2iSize,
+    .DEVmodSize = &HSM2mSize,
+
 #ifdef CIDER
     .DEVdump = NULL,
     .DEVacct = NULL,
 #endif
-    .DEVinstSize = &HSM2iSize,
-    .DEVmodSize = &HSM2mSize,
 };
 
 
diff --git a/src/spicelib/devices/hisimhv1/hsmhvinit.c b/src/spicelib/devices/hisimhv1/hsmhvinit.c
index cc571bc3f..620ddae0e 100644
--- a/src/spicelib/devices/hisimhv1/hsmhvinit.c
+++ b/src/spicelib/devices/hisimhv1/hsmhvinit.c
@@ -17,6 +17,8 @@ SPICEdev HSMHVinfo = {
         .instanceParms = HSMHVpTable,
         .numModelParms = &HSMHVmPTSize,
         .modelParms = HSMHVmPTable,
+        .flags = DEV_DEFAULT,
+
 #ifdef XSPICE
         .cm_func = NULL,
         .num_conn = 0,
@@ -26,8 +28,8 @@ SPICEdev HSMHVinfo = {
         .num_inst_var = 0,
         .inst_var = NULL,
 #endif
-        .flags = DEV_DEFAULT,
     },
+
     .DEVparam = HSMHVparam,
     .DEVmodParam = HSMHVmParam,
     .DEVload = HSMHVload,
@@ -56,12 +58,13 @@ SPICEdev HSMHVinfo = {
     .DEVdisto = NULL,
     .DEVnoise = HSMHVnoise,
     .DEVsoaCheck = HSMHVsoaCheck,
+    .DEVinstSize = &HSMHViSize,
+    .DEVmodSize = &HSMHVmSize,
+
 #ifdef CIDER
     .DEVdump = NULL,
     .DEVacct = NULL,
 #endif
-    .DEVinstSize = &HSMHViSize,
-    .DEVmodSize = &HSMHVmSize,
 };
 
 
diff --git a/src/spicelib/devices/hisimhv2/hsmhv2init.c b/src/spicelib/devices/hisimhv2/hsmhv2init.c
index a50804a8a..58f6667b4 100644
--- a/src/spicelib/devices/hisimhv2/hsmhv2init.c
+++ b/src/spicelib/devices/hisimhv2/hsmhv2init.c
@@ -17,6 +17,8 @@ SPICEdev HSMHV2info = {
         .instanceParms = HSMHV2pTable,
         .numModelParms = &HSMHV2mPTSize,
         .modelParms = HSMHV2mPTable,
+        .flags = DEV_DEFAULT,
+
 #ifdef XSPICE
         .cm_func = NULL,
         .num_conn = 0,
@@ -26,8 +28,8 @@ SPICEdev HSMHV2info = {
         .num_inst_var = 0,
         .inst_var = NULL,
 #endif
-        .flags = DEV_DEFAULT,
     },
+
     .DEVparam = HSMHV2param,
     .DEVmodParam = HSMHV2mParam,
     .DEVload = HSMHV2load,
@@ -56,12 +58,13 @@ SPICEdev HSMHV2info = {
     .DEVdisto = NULL,
     .DEVnoise = HSMHV2noise,
     .DEVsoaCheck = HSMHV2soaCheck,
+    .DEVinstSize = &HSMHV2iSize,
+    .DEVmodSize = &HSMHV2mSize,
+
 #ifdef CIDER
     .DEVdump = NULL,
     .DEVacct = NULL,
 #endif
-    .DEVinstSize = &HSMHV2iSize,
-    .DEVmodSize = &HSMHV2mSize,
 };
 
 
diff --git a/src/spicelib/devices/ind/indinit.c b/src/spicelib/devices/ind/indinit.c
index 606be9fdc..517a79e3f 100644
--- a/src/spicelib/devices/ind/indinit.c
+++ b/src/spicelib/devices/ind/indinit.c
@@ -18,6 +18,8 @@ SPICEdev INDinfo = {
         .instanceParms = INDpTable,
         .numModelParms = &INDmPTSize,
         .modelParms = INDmPTable,
+        .flags = 0,
+
 #ifdef XSPICE
         .cm_func = NULL,
         .num_conn = 0,
@@ -27,8 +29,8 @@ SPICEdev INDinfo = {
         .num_inst_var = 0,
         .inst_var = NULL,
 #endif
-        .flags = 0,
     },
+
     .DEVparam = INDparam,
     .DEVmodParam = INDmParam,
     .DEVload = INDload,
@@ -57,12 +59,13 @@ SPICEdev INDinfo = {
     .DEVdisto = NULL,
     .DEVnoise = NULL,
     .DEVsoaCheck = NULL,
+    .DEVinstSize = &INDiSize,
+    .DEVmodSize = &INDmSize,
+
 #ifdef CIDER
     .DEVdump = NULL,
     .DEVacct = NULL,
 #endif
-    .DEVinstSize = &INDiSize,
-    .DEVmodSize = &INDmSize,
 };
 
 
@@ -77,6 +80,8 @@ SPICEdev MUTinfo = {
         .instanceParms = MUTpTable,
         .numModelParms = NULL,
         .modelParms = NULL,
+        .flags = 0,
+
 #ifdef XSPICE
         .cm_func = NULL,
         .num_conn = 0,
@@ -86,8 +91,8 @@ SPICEdev MUTinfo = {
         .num_inst_var = 0,
         .inst_var = NULL,
 #endif
-        .flags = 0,
     },
+
     .DEVparam = MUTparam,
     .DEVmodParam = NULL,
     .DEVload = NULL,
@@ -116,12 +121,13 @@ SPICEdev MUTinfo = {
     .DEVdisto = NULL,
     .DEVnoise = NULL,
     .DEVsoaCheck = NULL,
+    .DEVinstSize = &MUTiSize,
+    .DEVmodSize = &MUTmSize,
+
 #ifdef CIDER
     .DEVdump = NULL,
     .DEVacct = NULL,
 #endif
-    .DEVinstSize = &MUTiSize,
-    .DEVmodSize = &MUTmSize,
 };
 
 
diff --git a/src/spicelib/devices/isrc/isrcinit.c b/src/spicelib/devices/isrc/isrcinit.c
index 300f3924a..f5a8a6744 100644
--- a/src/spicelib/devices/isrc/isrcinit.c
+++ b/src/spicelib/devices/isrc/isrcinit.c
@@ -18,6 +18,8 @@ SPICEdev ISRCinfo = {
         .instanceParms = ISRCpTable,
         .numModelParms = NULL,
         .modelParms = NULL,
+        .flags = DEV_DEFAULT,
+
 #ifdef XSPICE
         .cm_func = NULL,
         .num_conn = 0,
@@ -27,8 +29,8 @@ SPICEdev ISRCinfo = {
         .num_inst_var = 0,
         .inst_var = NULL,
 #endif
-        .flags = DEV_DEFAULT,
     },
+
     .DEVparam = ISRCparam,
     .DEVmodParam = NULL,
     .DEVload = ISRCload,
@@ -57,12 +59,13 @@ SPICEdev ISRCinfo = {
     .DEVdisto = NULL,
     .DEVnoise = NULL,
     .DEVsoaCheck = NULL,
+    .DEVinstSize = &ISRCiSize,
+    .DEVmodSize = &ISRCmSize,
+
 #ifdef CIDER
     .DEVdump = NULL,
     .DEVacct = NULL,
 #endif
-    .DEVinstSize = &ISRCiSize,
-    .DEVmodSize = &ISRCmSize,
 };
 
 
diff --git a/src/spicelib/devices/jfet/jfetinit.c b/src/spicelib/devices/jfet/jfetinit.c
index 286222d4e..0e47b487c 100644
--- a/src/spicelib/devices/jfet/jfetinit.c
+++ b/src/spicelib/devices/jfet/jfetinit.c
@@ -18,6 +18,8 @@ SPICEdev JFETinfo = {
         .instanceParms = JFETpTable,
         .numModelParms = &JFETmPTSize,
         .modelParms = JFETmPTable,
+        .flags = DEV_DEFAULT,
+
 #ifdef XSPICE
         .cm_func = NULL,
         .num_conn = 0,
@@ -27,8 +29,8 @@ SPICEdev JFETinfo = {
         .num_inst_var = 0,
         .inst_var = NULL,
 #endif
-        .flags = DEV_DEFAULT,
     },
+
     .DEVparam = JFETparam,
     .DEVmodParam = JFETmParam,
     .DEVload = JFETload,
@@ -57,12 +59,13 @@ SPICEdev JFETinfo = {
     .DEVdisto = JFETdisto,
     .DEVnoise = JFETnoise,
     .DEVsoaCheck = NULL,
+    .DEVinstSize = &JFETiSize,
+    .DEVmodSize = &JFETmSize,
+
 #ifdef CIDER
     .DEVdump = NULL,
     .DEVacct = NULL,
 #endif
-    .DEVinstSize = &JFETiSize,
-    .DEVmodSize = &JFETmSize,
 };
 
 
diff --git a/src/spicelib/devices/jfet2/jfet2init.c b/src/spicelib/devices/jfet2/jfet2init.c
index 3a25b8086..857706f4a 100644
--- a/src/spicelib/devices/jfet2/jfet2init.c
+++ b/src/spicelib/devices/jfet2/jfet2init.c
@@ -18,6 +18,8 @@ SPICEdev JFET2info = {
         .instanceParms = JFET2pTable,
         .numModelParms = &JFET2mPTSize,
         .modelParms = JFET2mPTable,
+        .flags = DEV_DEFAULT,
+
 #ifdef XSPICE
         .cm_func = NULL,
         .num_conn = 0,
@@ -27,8 +29,8 @@ SPICEdev JFET2info = {
         .num_inst_var = 0,
         .inst_var = NULL,
 #endif
-        .flags = DEV_DEFAULT,
     },
+
     .DEVparam = JFET2param,
     .DEVmodParam = JFET2mParam,
     .DEVload = JFET2load,
@@ -57,12 +59,13 @@ SPICEdev JFET2info = {
     .DEVdisto = NULL,
     .DEVnoise = JFET2noise,
     .DEVsoaCheck = NULL,
+    .DEVinstSize = &JFET2iSize,
+    .DEVmodSize = &JFET2mSize,
+
 #ifdef CIDER
     .DEVdump = NULL,
     .DEVacct = NULL,
 #endif
-    .DEVinstSize = &JFET2iSize,
-    .DEVmodSize = &JFET2mSize,
 };
 
 
diff --git a/src/spicelib/devices/ltra/ltrainit.c b/src/spicelib/devices/ltra/ltrainit.c
index 214c5a999..97988e7e2 100644
--- a/src/spicelib/devices/ltra/ltrainit.c
+++ b/src/spicelib/devices/ltra/ltrainit.c
@@ -18,6 +18,8 @@ SPICEdev LTRAinfo = {
         .instanceParms = LTRApTable,
         .numModelParms = &LTRAmPTSize,
         .modelParms = LTRAmPTable,
+        .flags = 0,
+
 #ifdef XSPICE
         .cm_func = NULL,
         .num_conn = 0,
@@ -27,8 +29,8 @@ SPICEdev LTRAinfo = {
         .num_inst_var = 0,
         .inst_var = NULL,
 #endif
-        .flags = 0,
     },
+
     .DEVparam = LTRAparam,
     .DEVmodParam = LTRAmParam,
     .DEVload = LTRAload,
@@ -57,12 +59,13 @@ SPICEdev LTRAinfo = {
     .DEVdisto = NULL,
     .DEVnoise = NULL,
     .DEVsoaCheck = NULL,
+    .DEVinstSize = &LTRAiSize,
+    .DEVmodSize = &LTRAmSize,
+
 #ifdef CIDER
     .DEVdump = NULL,
     .DEVacct = NULL,
 #endif
-    .DEVinstSize = &LTRAiSize,
-    .DEVmodSize = &LTRAmSize,
 };
 
 
diff --git a/src/spicelib/devices/mes/mesinit.c b/src/spicelib/devices/mes/mesinit.c
index e2709fc23..151e5aafe 100644
--- a/src/spicelib/devices/mes/mesinit.c
+++ b/src/spicelib/devices/mes/mesinit.c
@@ -18,6 +18,8 @@ SPICEdev MESinfo = {
         .instanceParms = MESpTable,
         .numModelParms = &MESmPTSize,
         .modelParms = MESmPTable,
+        .flags = DEV_DEFAULT,
+
 #ifdef XSPICE
         .cm_func = NULL,
         .num_conn = 0,
@@ -27,8 +29,8 @@ SPICEdev MESinfo = {
         .num_inst_var = 0,
         .inst_var = NULL,
 #endif
-        .flags = DEV_DEFAULT,
     },
+
     .DEVparam = MESparam,
     .DEVmodParam = MESmParam,
     .DEVload = MESload,
@@ -57,12 +59,13 @@ SPICEdev MESinfo = {
     .DEVdisto = MESdisto,
     .DEVnoise = MESnoise,
     .DEVsoaCheck = NULL,
+    .DEVinstSize = &MESiSize,
+    .DEVmodSize = &MESmSize,
+
 #ifdef CIDER
     .DEVdump = NULL,
     .DEVacct = NULL,
 #endif
-    .DEVinstSize = &MESiSize,
-    .DEVmodSize = &MESmSize,
 };
 
 
diff --git a/src/spicelib/devices/mesa/mesainit.c b/src/spicelib/devices/mesa/mesainit.c
index 8fbb78abe..8d632347d 100644
--- a/src/spicelib/devices/mesa/mesainit.c
+++ b/src/spicelib/devices/mesa/mesainit.c
@@ -18,6 +18,8 @@ SPICEdev MESAinfo = {
         .instanceParms = MESApTable,
         .numModelParms = &MESAmPTSize,
         .modelParms = MESAmPTable,
+        .flags = DEV_DEFAULT,
+
 #ifdef XSPICE
         .cm_func = NULL,
         .num_conn = 0,
@@ -27,8 +29,8 @@ SPICEdev MESAinfo = {
         .num_inst_var = 0,
         .inst_var = NULL,
 #endif
-        .flags = DEV_DEFAULT,
     },
+
     .DEVparam = MESAparam,
     .DEVmodParam = MESAmParam,
     .DEVload = MESAload,
@@ -57,12 +59,13 @@ SPICEdev MESAinfo = {
     .DEVdisto = NULL,
     .DEVnoise = NULL,
     .DEVsoaCheck = NULL,
+    .DEVinstSize = &MESAiSize,
+    .DEVmodSize = &MESAmSize,
+
 #ifdef CIDER
     .DEVdump = NULL,
     .DEVacct = NULL,
 #endif
-    .DEVinstSize = &MESAiSize,
-    .DEVmodSize = &MESAmSize,
 };
 
 
diff --git a/src/spicelib/devices/mos1/mos1init.c b/src/spicelib/devices/mos1/mos1init.c
index b6812b5a8..6f1923164 100644
--- a/src/spicelib/devices/mos1/mos1init.c
+++ b/src/spicelib/devices/mos1/mos1init.c
@@ -18,6 +18,8 @@ SPICEdev MOS1info = {
         .instanceParms = MOS1pTable,
         .numModelParms = &MOS1mPTSize,
         .modelParms = MOS1mPTable,
+        .flags = DEV_DEFAULT,
+
 #ifdef XSPICE
         .cm_func = NULL,
         .num_conn = 0,
@@ -27,8 +29,8 @@ SPICEdev MOS1info = {
         .num_inst_var = 0,
         .inst_var = NULL,
 #endif
-        .flags = DEV_DEFAULT,
     },
+
     .DEVparam = MOS1param,
     .DEVmodParam = MOS1mParam,
     .DEVload = MOS1load,
@@ -57,12 +59,13 @@ SPICEdev MOS1info = {
     .DEVdisto = MOS1disto,
     .DEVnoise = MOS1noise,
     .DEVsoaCheck = NULL,
+    .DEVinstSize = &MOS1iSize,
+    .DEVmodSize = &MOS1mSize,
+
 #ifdef CIDER
     .DEVdump = NULL,
     .DEVacct = NULL,
 #endif
-    .DEVinstSize = &MOS1iSize,
-    .DEVmodSize = &MOS1mSize,
 };
 
 
diff --git a/src/spicelib/devices/mos2/mos2init.c b/src/spicelib/devices/mos2/mos2init.c
index 63c724590..297a0edde 100644
--- a/src/spicelib/devices/mos2/mos2init.c
+++ b/src/spicelib/devices/mos2/mos2init.c
@@ -18,6 +18,8 @@ SPICEdev MOS2info = {
         .instanceParms = MOS2pTable,
         .numModelParms = &MOS2mPTSize,
         .modelParms = MOS2mPTable,
+        .flags = DEV_DEFAULT,
+
 #ifdef XSPICE
         .cm_func = NULL,
         .num_conn = 0,
@@ -27,8 +29,8 @@ SPICEdev MOS2info = {
         .num_inst_var = 0,
         .inst_var = NULL,
 #endif
-        .flags = DEV_DEFAULT,
     },
+
     .DEVparam = MOS2param,
     .DEVmodParam = MOS2mParam,
     .DEVload = MOS2load,
@@ -57,12 +59,13 @@ SPICEdev MOS2info = {
     .DEVdisto = MOS2disto,
     .DEVnoise = MOS2noise,
     .DEVsoaCheck = NULL,
+    .DEVinstSize = &MOS2iSize,
+    .DEVmodSize = &MOS2mSize,
+
 #ifdef CIDER
     .DEVdump = NULL,
     .DEVacct = NULL,
 #endif
-    .DEVinstSize = &MOS2iSize,
-    .DEVmodSize = &MOS2mSize,
 };
 
 
diff --git a/src/spicelib/devices/mos3/mos3init.c b/src/spicelib/devices/mos3/mos3init.c
index 5a6a04c07..d962dd88a 100644
--- a/src/spicelib/devices/mos3/mos3init.c
+++ b/src/spicelib/devices/mos3/mos3init.c
@@ -18,6 +18,8 @@ SPICEdev MOS3info = {
         .instanceParms = MOS3pTable,
         .numModelParms = &MOS3mPTSize,
         .modelParms = MOS3mPTable,
+        .flags = DEV_DEFAULT,
+
 #ifdef XSPICE
         .cm_func = NULL,
         .num_conn = 0,
@@ -27,8 +29,8 @@ SPICEdev MOS3info = {
         .num_inst_var = 0,
         .inst_var = NULL,
 #endif
-        .flags = DEV_DEFAULT,
     },
+
     .DEVparam = MOS3param,
     .DEVmodParam = MOS3mParam,
     .DEVload = MOS3load,
@@ -57,12 +59,13 @@ SPICEdev MOS3info = {
     .DEVdisto = MOS3disto,
     .DEVnoise = MOS3noise,
     .DEVsoaCheck = NULL,
+    .DEVinstSize = &MOS3iSize,
+    .DEVmodSize = &MOS3mSize,
+
 #ifdef CIDER
     .DEVdump = NULL,
     .DEVacct = NULL,
 #endif
-    .DEVinstSize = &MOS3iSize,
-    .DEVmodSize = &MOS3mSize,
 };
 
 
diff --git a/src/spicelib/devices/mos6/mos6init.c b/src/spicelib/devices/mos6/mos6init.c
index 1ef9a4bd9..a4273df19 100644
--- a/src/spicelib/devices/mos6/mos6init.c
+++ b/src/spicelib/devices/mos6/mos6init.c
@@ -18,6 +18,8 @@ SPICEdev MOS6info = {
         .instanceParms = MOS6pTable,
         .numModelParms = &MOS6mPTSize,
         .modelParms = MOS6mPTable,
+        .flags = DEV_DEFAULT,
+
 #ifdef XSPICE
         .cm_func = NULL,
         .num_conn = 0,
@@ -27,8 +29,8 @@ SPICEdev MOS6info = {
         .num_inst_var = 0,
         .inst_var = NULL,
 #endif
-        .flags = DEV_DEFAULT,
     },
+
     .DEVparam = MOS6param,
     .DEVmodParam = MOS6mParam,
     .DEVload = MOS6load,
@@ -57,12 +59,13 @@ SPICEdev MOS6info = {
     .DEVdisto = NULL,
     .DEVnoise = NULL,
     .DEVsoaCheck = NULL,
+    .DEVinstSize = &MOS6iSize,
+    .DEVmodSize = &MOS6mSize,
+
 #ifdef CIDER
     .DEVdump = NULL,
     .DEVacct = NULL,
 #endif
-    .DEVinstSize = &MOS6iSize,
-    .DEVmodSize = &MOS6mSize,
 };
 
 
diff --git a/src/spicelib/devices/mos9/mos9init.c b/src/spicelib/devices/mos9/mos9init.c
index fd12312f5..292c6bfc6 100644
--- a/src/spicelib/devices/mos9/mos9init.c
+++ b/src/spicelib/devices/mos9/mos9init.c
@@ -18,6 +18,8 @@ SPICEdev MOS9info = {
         .instanceParms = MOS9pTable,
         .numModelParms = &MOS9mPTSize,
         .modelParms = MOS9mPTable,
+        .flags = DEV_DEFAULT,
+
 #ifdef XSPICE
         .cm_func = NULL,
         .num_conn = 0,
@@ -27,8 +29,8 @@ SPICEdev MOS9info = {
         .num_inst_var = 0,
         .inst_var = NULL,
 #endif
-        .flags = DEV_DEFAULT,
     },
+
     .DEVparam = MOS9param,
     .DEVmodParam = MOS9mParam,
     .DEVload = MOS9load,
@@ -57,12 +59,13 @@ SPICEdev MOS9info = {
     .DEVdisto = MOS9disto,
     .DEVnoise = MOS9noise,
     .DEVsoaCheck = NULL,
+    .DEVinstSize = &MOS9iSize,
+    .DEVmodSize = &MOS9mSize,
+
 #ifdef CIDER
     .DEVdump = NULL,
     .DEVacct = NULL,
 #endif
-    .DEVinstSize = &MOS9iSize,
-    .DEVmodSize = &MOS9mSize,
 };
 
 
diff --git a/src/spicelib/devices/nbjt/nbjtinit.c b/src/spicelib/devices/nbjt/nbjtinit.c
index ab5c1452b..af222ffe1 100644
--- a/src/spicelib/devices/nbjt/nbjtinit.c
+++ b/src/spicelib/devices/nbjt/nbjtinit.c
@@ -18,6 +18,8 @@ SPICEdev NBJTinfo = {
         .instanceParms = NBJTpTable,
         .numModelParms = &NBJTmPTSize,
         .modelParms = NBJTmPTable,
+        .flags = DEV_DEFAULT,
+
 #ifdef XSPICE
         .cm_func = NULL,
         .num_conn = 0,
@@ -27,8 +29,8 @@ SPICEdev NBJTinfo = {
         .num_inst_var = 0,
         .inst_var = NULL,
 #endif
-        .flags = DEV_DEFAULT,
     },
+
     .DEVparam = NBJTparam,
     .DEVmodParam = NBJTmParam,
     .DEVload = NBJTload,
@@ -57,12 +59,13 @@ SPICEdev NBJTinfo = {
     .DEVdisto = NULL,
     .DEVnoise = NULL,
     .DEVsoaCheck = NULL,
+    .DEVinstSize = &NBJTiSize,
+    .DEVmodSize = &NBJTmSize,
+
 #ifdef CIDER
     .DEVdump = NBJTdump,
     .DEVacct = NBJTacct,
 #endif
-    .DEVinstSize = &NBJTiSize,
-    .DEVmodSize = &NBJTmSize,
 };
 
 
diff --git a/src/spicelib/devices/nbjt2/nbt2init.c b/src/spicelib/devices/nbjt2/nbt2init.c
index 78c60e5f0..a0c9f8653 100644
--- a/src/spicelib/devices/nbjt2/nbt2init.c
+++ b/src/spicelib/devices/nbjt2/nbt2init.c
@@ -18,6 +18,8 @@ SPICEdev NBJT2info = {
         .instanceParms = NBJT2pTable,
         .numModelParms = &NBJT2mPTSize,
         .modelParms = NBJT2mPTable,
+        .flags = DEV_DEFAULT,
+
 #ifdef XSPICE
         .cm_func = NULL,
         .num_conn = 0,
@@ -27,8 +29,8 @@ SPICEdev NBJT2info = {
         .num_inst_var = 0,
         .inst_var = NULL,
 #endif
-        .flags = DEV_DEFAULT,
     },
+
     .DEVparam = NBJT2param,
     .DEVmodParam = NBJT2mParam,
     .DEVload = NBJT2load,
@@ -57,12 +59,13 @@ SPICEdev NBJT2info = {
     .DEVdisto = NULL,
     .DEVnoise = NULL,
     .DEVsoaCheck = NULL,
+    .DEVinstSize = &NBJT2iSize,
+    .DEVmodSize = &NBJT2mSize,
+
 #ifdef CIDER
     .DEVdump = NBJT2dump,
     .DEVacct = NBJT2acct,
 #endif
-    .DEVinstSize = &NBJT2iSize,
-    .DEVmodSize = &NBJT2mSize,
 };
 
 
diff --git a/src/spicelib/devices/ndev/ndevinit.c b/src/spicelib/devices/ndev/ndevinit.c
index 25a90d008..f65046905 100644
--- a/src/spicelib/devices/ndev/ndevinit.c
+++ b/src/spicelib/devices/ndev/ndevinit.c
@@ -18,6 +18,8 @@ SPICEdev NDEVinfo = {
         .instanceParms = NDEVpTable,
         .numModelParms = &NDEVmPTSize,
         .modelParms = NDEVmPTable,
+        .flags = DEV_DEFAULT,
+
 #ifdef XSPICE
         .cm_func = NULL,
         .num_conn = 0,
@@ -27,8 +29,8 @@ SPICEdev NDEVinfo = {
         .num_inst_var = 0,
         .inst_var = NULL,
 #endif
-        .flags = DEV_DEFAULT,
     },
+
     .DEVparam = NDEVparam,
     .DEVmodParam = NDEVmParam,
     .DEVload = NDEVload,
@@ -57,12 +59,13 @@ SPICEdev NDEVinfo = {
     .DEVdisto = NULL,
     .DEVnoise = NULL,
     .DEVsoaCheck = NULL,
+    .DEVinstSize = &NDEViSize,
+    .DEVmodSize = &NDEVmSize,
+
 #ifdef CIDER
     .DEVdump = NULL,
     .DEVacct = NULL,
 #endif
-    .DEVinstSize = &NDEViSize,
-    .DEVmodSize = &NDEVmSize,
 };
 
 
diff --git a/src/spicelib/devices/numd/numdinit.c b/src/spicelib/devices/numd/numdinit.c
index 8aac9cdc4..bf036444a 100644
--- a/src/spicelib/devices/numd/numdinit.c
+++ b/src/spicelib/devices/numd/numdinit.c
@@ -18,6 +18,8 @@ SPICEdev NUMDinfo = {
         .instanceParms = NUMDpTable,
         .numModelParms = &NUMDmPTSize,
         .modelParms = NUMDmPTable,
+        .flags = DEV_DEFAULT,
+
 #ifdef XSPICE
         .cm_func = NULL,
         .num_conn = 0,
@@ -27,8 +29,8 @@ SPICEdev NUMDinfo = {
         .num_inst_var = 0,
         .inst_var = NULL,
 #endif
-        .flags = DEV_DEFAULT,
     },
+
     .DEVparam = NUMDparam,
     .DEVmodParam = NUMDmParam,
     .DEVload = NUMDload,
@@ -57,12 +59,13 @@ SPICEdev NUMDinfo = {
     .DEVdisto = NULL,
     .DEVnoise = NULL,
     .DEVsoaCheck = NULL,
+    .DEVinstSize = &NUMDiSize,
+    .DEVmodSize = &NUMDmSize,
+
 #ifdef CIDER
     .DEVdump = NUMDdump,
     .DEVacct = NUMDacct,
 #endif
-    .DEVinstSize = &NUMDiSize,
-    .DEVmodSize = &NUMDmSize,
 };
 
 
diff --git a/src/spicelib/devices/numd2/numd2init.c b/src/spicelib/devices/numd2/numd2init.c
index 7bcdecbdf..9d22900b1 100644
--- a/src/spicelib/devices/numd2/numd2init.c
+++ b/src/spicelib/devices/numd2/numd2init.c
@@ -18,6 +18,8 @@ SPICEdev NUMD2info = {
         .instanceParms = NUMD2pTable,
         .numModelParms = &NUMD2mPTSize,
         .modelParms = NUMD2mPTable,
+        .flags = DEV_DEFAULT,
+
 #ifdef XSPICE
         .cm_func = NULL,
         .num_conn = 0,
@@ -27,8 +29,8 @@ SPICEdev NUMD2info = {
         .num_inst_var = 0,
         .inst_var = NULL,
 #endif
-        .flags = DEV_DEFAULT,
     },
+
     .DEVparam = NUMD2param,
     .DEVmodParam = NUMD2mParam,
     .DEVload = NUMD2load,
@@ -57,12 +59,13 @@ SPICEdev NUMD2info = {
     .DEVdisto = NULL,
     .DEVnoise = NULL,
     .DEVsoaCheck = NULL,
+    .DEVinstSize = &NUMD2iSize,
+    .DEVmodSize = &NUMD2mSize,
+
 #ifdef CIDER
     .DEVdump = NUMD2dump,
     .DEVacct = NUMD2acct,
 #endif
-    .DEVinstSize = &NUMD2iSize,
-    .DEVmodSize = &NUMD2mSize,
 };
 
 
diff --git a/src/spicelib/devices/numos/numosinit.c b/src/spicelib/devices/numos/numosinit.c
index 71c54ed72..ee1ef902d 100644
--- a/src/spicelib/devices/numos/numosinit.c
+++ b/src/spicelib/devices/numos/numosinit.c
@@ -18,6 +18,8 @@ SPICEdev NUMOSinfo = {
         .instanceParms = NUMOSpTable,
         .numModelParms = &NUMOSmPTSize,
         .modelParms = NUMOSmPTable,
+        .flags = DEV_DEFAULT,
+
 #ifdef XSPICE
         .cm_func = NULL,
         .num_conn = 0,
@@ -27,8 +29,8 @@ SPICEdev NUMOSinfo = {
         .num_inst_var = 0,
         .inst_var = NULL,
 #endif
-        .flags = DEV_DEFAULT,
     },
+
     .DEVparam = NUMOSparam,
     .DEVmodParam = NUMOSmParam,
     .DEVload = NUMOSload,
@@ -57,12 +59,13 @@ SPICEdev NUMOSinfo = {
     .DEVdisto = NULL,
     .DEVnoise = NULL,
     .DEVsoaCheck = NULL,
+    .DEVinstSize = &NUMOSiSize,
+    .DEVmodSize = &NUMOSmSize,
+
 #ifdef CIDER
     .DEVdump = NUMOSdump,
     .DEVacct = NUMOSacct,
 #endif
-    .DEVinstSize = &NUMOSiSize,
-    .DEVmodSize = &NUMOSmSize,
 };
 
 
diff --git a/src/spicelib/devices/res/resinit.c b/src/spicelib/devices/res/resinit.c
index 26c327512..75dfc13be 100644
--- a/src/spicelib/devices/res/resinit.c
+++ b/src/spicelib/devices/res/resinit.c
@@ -18,6 +18,8 @@ SPICEdev RESinfo = {
         .instanceParms = RESpTable,
         .numModelParms = &RESmPTSize,
         .modelParms = RESmPTable,
+        .flags = 0,
+
 #ifdef XSPICE
         .cm_func = NULL,
         .num_conn = 0,
@@ -27,8 +29,8 @@ SPICEdev RESinfo = {
         .num_inst_var = 0,
         .inst_var = NULL,
 #endif
-        .flags = 0,
     },
+
     .DEVparam = RESparam,
     .DEVmodParam = RESmParam,
     .DEVload = RESload,
@@ -57,12 +59,13 @@ SPICEdev RESinfo = {
     .DEVdisto = NULL,
     .DEVnoise = RESnoise,
     .DEVsoaCheck = RESsoaCheck,
+    .DEVinstSize = &RESiSize,
+    .DEVmodSize = &RESmSize,
+
 #ifdef CIDER
     .DEVdump = NULL,
     .DEVacct = NULL,
 #endif
-    .DEVinstSize = &RESiSize,
-    .DEVmodSize = &RESmSize,
 };
 
 
diff --git a/src/spicelib/devices/soi3/soi3init.c b/src/spicelib/devices/soi3/soi3init.c
index d968745e7..cb60a76ed 100644
--- a/src/spicelib/devices/soi3/soi3init.c
+++ b/src/spicelib/devices/soi3/soi3init.c
@@ -18,6 +18,8 @@ SPICEdev SOI3info = {
         .instanceParms = SOI3pTable,
         .numModelParms = &SOI3mPTSize,
         .modelParms = SOI3mPTable,
+        .flags = DEV_DEFAULT,
+
 #ifdef XSPICE
         .cm_func = NULL,
         .num_conn = 0,
@@ -27,8 +29,8 @@ SPICEdev SOI3info = {
         .num_inst_var = 0,
         .inst_var = NULL,
 #endif
-        .flags = DEV_DEFAULT,
     },
+
     .DEVparam = SOI3param,
     .DEVmodParam = SOI3mParam,
     .DEVload = SOI3load,
@@ -57,12 +59,13 @@ SPICEdev SOI3info = {
     .DEVdisto = NULL,
     .DEVnoise = SOI3noise,
     .DEVsoaCheck = NULL,
+    .DEVinstSize = &SOI3iSize,
+    .DEVmodSize = &SOI3mSize,
+
 #ifdef CIDER
     .DEVdump = NULL,
     .DEVacct = NULL,
 #endif
-    .DEVinstSize = &SOI3iSize,
-    .DEVmodSize = &SOI3mSize,
 };
 
 
diff --git a/src/spicelib/devices/sw/swinit.c b/src/spicelib/devices/sw/swinit.c
index d1eb896bd..1222545f1 100644
--- a/src/spicelib/devices/sw/swinit.c
+++ b/src/spicelib/devices/sw/swinit.c
@@ -19,6 +19,8 @@ SPICEdev SWinfo = {
         .instanceParms = SWpTable,
         .numModelParms = &SWmPTSize,
         .modelParms = SWmPTable,
+        .flags = 0,
+
 #ifdef XSPICE
         .cm_func = NULL,
         .num_conn = 0,
@@ -28,8 +30,8 @@ SPICEdev SWinfo = {
         .num_inst_var = 0,
         .inst_var = NULL,
 #endif
-        .flags = 0,
     },
+
     .DEVparam = SWparam,
     .DEVmodParam = SWmParam,
     .DEVload = SWload,
@@ -58,12 +60,13 @@ SPICEdev SWinfo = {
     .DEVdisto = NULL,
     .DEVnoise = SWnoise,
     .DEVsoaCheck = NULL,
+    .DEVinstSize = &SWiSize,
+    .DEVmodSize = &SWmSize,
+
 #ifdef CIDER
     .DEVdump = NULL,
     .DEVacct = NULL,
 #endif
-    .DEVinstSize = &SWiSize,
-    .DEVmodSize = &SWmSize,
 };
 
 
diff --git a/src/spicelib/devices/tra/trainit.c b/src/spicelib/devices/tra/trainit.c
index 24302a7a2..ff0853da3 100644
--- a/src/spicelib/devices/tra/trainit.c
+++ b/src/spicelib/devices/tra/trainit.c
@@ -18,6 +18,8 @@ SPICEdev TRAinfo = {
         .instanceParms = TRApTable,
         .numModelParms = NULL,
         .modelParms = NULL,
+        .flags = 0,
+
 #ifdef XSPICE
         .cm_func = NULL,
         .num_conn = 0,
@@ -27,8 +29,8 @@ SPICEdev TRAinfo = {
         .num_inst_var = 0,
         .inst_var = NULL,
 #endif
-        .flags = 0,
     },
+
     .DEVparam = TRAparam,
     .DEVmodParam = NULL,
     .DEVload = TRAload,
@@ -57,12 +59,13 @@ SPICEdev TRAinfo = {
     .DEVdisto = NULL,
     .DEVnoise = NULL,
     .DEVsoaCheck = NULL,
+    .DEVinstSize = &TRAiSize,
+    .DEVmodSize = &TRAmSize,
+
 #ifdef CIDER
     .DEVdump = NULL,
     .DEVacct = NULL,
 #endif
-    .DEVinstSize = &TRAiSize,
-    .DEVmodSize = &TRAmSize,
 };
 
 
diff --git a/src/spicelib/devices/txl/txlinit.c b/src/spicelib/devices/txl/txlinit.c
index db5cd2370..64a502cf3 100644
--- a/src/spicelib/devices/txl/txlinit.c
+++ b/src/spicelib/devices/txl/txlinit.c
@@ -23,6 +23,8 @@ SPICEdev TXLinfo = {
 	.instanceParms = TXLpTable,
 	.numModelParms = &TXLmPTSize,
 	.modelParms = TXLmPTable,
+	.flags = 0,
+
 #ifdef XSPICE
 	.cm_func = NULL,
 	.num_conn = 0,
@@ -32,8 +34,8 @@ SPICEdev TXLinfo = {
 	.num_inst_var = 0,
 	.inst_var = NULL,
 #endif
-	.flags = 0,
     },
+
     .DEVparam = TXLparam,
     .DEVmodParam = TXLmParam,
     .DEVload = TXLload,
@@ -62,12 +64,13 @@ SPICEdev TXLinfo = {
     .DEVdisto = NULL,
     .DEVnoise = NULL,
     .DEVsoaCheck = NULL,
+    .DEVinstSize = &TXLiSize,
+    .DEVmodSize = &TXLmSize,
+
 #ifdef CIDER
     .DEVdump = NULL,
     .DEVacct = NULL,
 #endif
-    .DEVinstSize = &TXLiSize,
-    .DEVmodSize = &TXLmSize,
 };
 
 SPICEdev *
diff --git a/src/spicelib/devices/urc/urcinit.c b/src/spicelib/devices/urc/urcinit.c
index 3c404cf71..181465191 100644
--- a/src/spicelib/devices/urc/urcinit.c
+++ b/src/spicelib/devices/urc/urcinit.c
@@ -18,6 +18,8 @@ SPICEdev URCinfo = {
         .instanceParms = URCpTable,
         .numModelParms = &URCmPTSize,
         .modelParms = URCmPTable,
+        .flags = 0,
+
 #ifdef XSPICE
         .cm_func = NULL,
         .num_conn = 0,
@@ -27,8 +29,8 @@ SPICEdev URCinfo = {
         .num_inst_var = 0,
         .inst_var = NULL,
 #endif
-        .flags = 0,
     },
+
     .DEVparam = URCparam,
     .DEVmodParam = URCmParam,
     .DEVload = NULL,
@@ -57,12 +59,13 @@ SPICEdev URCinfo = {
     .DEVdisto = NULL,
     .DEVnoise = NULL,
     .DEVsoaCheck = NULL,
+    .DEVinstSize = &URCiSize,
+    .DEVmodSize = &URCmSize,
+
 #ifdef CIDER
     .DEVdump = NULL,
     .DEVacct = NULL,
 #endif
-    .DEVinstSize = &URCiSize,
-    .DEVmodSize = &URCmSize,
 };
 
 
diff --git a/src/spicelib/devices/vbic/vbicinit.c b/src/spicelib/devices/vbic/vbicinit.c
index 573bbad9d..77fd2531e 100644
--- a/src/spicelib/devices/vbic/vbicinit.c
+++ b/src/spicelib/devices/vbic/vbicinit.c
@@ -23,6 +23,8 @@ SPICEdev VBICinfo = {
         .instanceParms = VBICpTable,
         .numModelParms = &VBICmPTSize,
         .modelParms = VBICmPTable,
+        .flags = DEV_DEFAULT,
+
 #ifdef XSPICE
         .cm_func = NULL,
         .num_conn = 0,
@@ -32,8 +34,8 @@ SPICEdev VBICinfo = {
         .num_inst_var = 0,
         .inst_var = NULL,
 #endif
-        .flags = DEV_DEFAULT,
     },
+
     .DEVparam = VBICparam,
     .DEVmodParam = VBICmParam,
     .DEVload = VBICload,
@@ -62,12 +64,13 @@ SPICEdev VBICinfo = {
     .DEVdisto = NULL,
     .DEVnoise = VBICnoise,
     .DEVsoaCheck = VBICsoaCheck,
+    .DEVinstSize = &VBICiSize,
+    .DEVmodSize = &VBICmSize,
+
 #ifdef CIDER
     .DEVdump = NULL,
     .DEVacct = NULL,
 #endif
-    .DEVinstSize = &VBICiSize,
-    .DEVmodSize = &VBICmSize,
 };
 
 
diff --git a/src/spicelib/devices/vccs/vccsinit.c b/src/spicelib/devices/vccs/vccsinit.c
index 235987d03..1e1ba8002 100644
--- a/src/spicelib/devices/vccs/vccsinit.c
+++ b/src/spicelib/devices/vccs/vccsinit.c
@@ -18,6 +18,8 @@ SPICEdev VCCSinfo = {
         .instanceParms = VCCSpTable,
         .numModelParms = NULL,
         .modelParms = NULL,
+        .flags = DEV_DEFAULT,
+
 #ifdef XSPICE
         .cm_func = NULL,
         .num_conn = 0,
@@ -27,8 +29,8 @@ SPICEdev VCCSinfo = {
         .num_inst_var = 0,
         .inst_var = NULL,
 #endif
-        .flags = DEV_DEFAULT,
     },
+
     .DEVparam = VCCSparam,
     .DEVmodParam = NULL,
     .DEVload = VCCSload,
@@ -57,12 +59,13 @@ SPICEdev VCCSinfo = {
     .DEVdisto = NULL,
     .DEVnoise = NULL,
     .DEVsoaCheck = NULL,
+    .DEVinstSize = &VCCSiSize,
+    .DEVmodSize = &VCCSmSize,
+
 #ifdef CIDER
     .DEVdump = NULL,
     .DEVacct = NULL,
 #endif
-    .DEVinstSize = &VCCSiSize,
-    .DEVmodSize = &VCCSmSize,
 };
 
 
diff --git a/src/spicelib/devices/vcvs/vcvsinit.c b/src/spicelib/devices/vcvs/vcvsinit.c
index c44330184..7b5147d88 100644
--- a/src/spicelib/devices/vcvs/vcvsinit.c
+++ b/src/spicelib/devices/vcvs/vcvsinit.c
@@ -18,6 +18,8 @@ SPICEdev VCVSinfo = {
         .instanceParms = VCVSpTable,
         .numModelParms = NULL,
         .modelParms = NULL,
+        .flags = DEV_DEFAULT,
+
 #ifdef XSPICE
         .cm_func = NULL,
         .num_conn = 0,
@@ -27,8 +29,8 @@ SPICEdev VCVSinfo = {
         .num_inst_var = 0,
         .inst_var = NULL,
 #endif
-        .flags = DEV_DEFAULT,
     },
+
     .DEVparam = VCVSparam,
     .DEVmodParam = NULL,
     .DEVload = VCVSload,
@@ -57,12 +59,13 @@ SPICEdev VCVSinfo = {
     .DEVdisto = NULL,
     .DEVnoise = NULL,
     .DEVsoaCheck = NULL,
+    .DEVinstSize = &VCVSiSize,
+    .DEVmodSize = &VCVSmSize,
+
 #ifdef CIDER
     .DEVdump = NULL,
     .DEVacct = NULL,
 #endif
-    .DEVinstSize = &VCVSiSize,
-    .DEVmodSize = &VCVSmSize,
 };
 
 
diff --git a/src/spicelib/devices/vsrc/vsrcinit.c b/src/spicelib/devices/vsrc/vsrcinit.c
index fe0ac763e..db0417a0d 100644
--- a/src/spicelib/devices/vsrc/vsrcinit.c
+++ b/src/spicelib/devices/vsrc/vsrcinit.c
@@ -18,6 +18,8 @@ SPICEdev VSRCinfo = {
         .instanceParms = VSRCpTable,
         .numModelParms = NULL,
         .modelParms = NULL,
+        .flags = DEV_DEFAULT,
+
 #ifdef XSPICE
         .cm_func = NULL,
         .num_conn = 0,
@@ -27,8 +29,8 @@ SPICEdev VSRCinfo = {
         .num_inst_var = 0,
         .inst_var = NULL,
 #endif
-        .flags = DEV_DEFAULT,
     },
+
     .DEVparam = VSRCparam,
     .DEVmodParam = NULL,
     .DEVload = VSRCload,
@@ -57,12 +59,13 @@ SPICEdev VSRCinfo = {
     .DEVdisto = NULL,
     .DEVnoise = NULL,
     .DEVsoaCheck = NULL,
+    .DEVinstSize = &VSRCiSize,
+    .DEVmodSize = &VSRCmSize,
+
 #ifdef CIDER
     .DEVdump = NULL,
     .DEVacct = NULL,
 #endif
-    .DEVinstSize = &VSRCiSize,
-    .DEVmodSize = &VSRCmSize,
 };