diff --git a/src/conf.c b/src/conf.c
index 26273ef58..8580f7e2a 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -42,7 +42,7 @@
 
 
 /*
- * Configuration options available in the rig->state struct.
+ * Configuration options available in the STATE(rig) struct.
  */
 static const struct confparams frontend_cfg_params[] =
 {
@@ -250,7 +250,7 @@ static int frontend_set_conf(RIG *rig, hamlib_token_t token, const char *val)
     long val_i;
 
     caps = rig->caps;
-    rs = &rig->state;
+    rs = STATE(rig);
 
     switch (token)
     {
@@ -871,7 +871,7 @@ static int frontend_get_conf2(RIG *rig, hamlib_token_t token, char *val, int val
     hamlib_port_t *pttp = PTTPORT(rig);
     hamlib_port_t *dcdp = DCDPORT(rig);
 
-    rs = &rig->state;
+    rs = STATE(rig);
 
     switch (token)
     {
diff --git a/src/event.c b/src/event.c
index 5671be0a6..10a47ff88 100644
--- a/src/event.c
+++ b/src/event.c
@@ -50,7 +50,7 @@
 #include "cache.h"
 #include "network.h"
 
-#define CHECK_RIG_ARG(r) (!(r) || !(r)->caps || !(r)->state.comm_state)
+#define CHECK_RIG_ARG(r) (!(r) || !(r)->caps || !STATE(r)->comm_state)
 
 #ifdef HAVE_PTHREAD
 typedef struct rig_poll_routine_args_s
@@ -68,7 +68,7 @@ void *rig_poll_routine(void *arg)
 {
     rig_poll_routine_args *args = (rig_poll_routine_args *)arg;
     RIG *rig = args->rig;
-    struct rig_state *rs = &rig->state;
+    struct rig_state *rs = STATE(rig);
     struct rig_cache *cachep = CACHE(rig);
     int update_occurred;
 
@@ -98,15 +98,15 @@ void *rig_poll_routine(void *arg)
 
     while (rs->poll_routine_thread_run)
     {
-        if (rig->state.current_vfo != vfo)
+        if (rs->current_vfo != vfo)
         {
-            vfo = rig->state.current_vfo;
+            vfo = rs->current_vfo;
             update_occurred = 1;
         }
 
-        if (rig->state.tx_vfo != tx_vfo)
+        if (rs->tx_vfo != tx_vfo)
         {
-            tx_vfo = rig->state.tx_vfo;
+            tx_vfo = rs->tx_vfo;
             update_occurred = 1;
         }
 
@@ -266,7 +266,7 @@ void *rig_poll_routine(void *arg)
  */
 int rig_poll_routine_start(RIG *rig)
 {
-    struct rig_state *rs = &rig->state;
+    struct rig_state *rs = STATE(rig);
     rig_poll_routine_priv_data *poll_routine_priv;
 
     ENTERFUNC;
@@ -321,7 +321,7 @@ int rig_poll_routine_start(RIG *rig)
  */
 int rig_poll_routine_stop(RIG *rig)
 {
-    struct rig_state *rs = &rig->state;
+    struct rig_state *rs = STATE(rig);
     rig_poll_routine_priv_data *poll_routine_priv;
 
     ENTERFUNC;
@@ -614,6 +614,7 @@ int rig_fire_freq_event(RIG *rig, vfo_t vfo, freq_t freq)
 {
     ENTERFUNC;
 
+    struct rig_state *rs = STATE(rig);
     double dfreq = freq;
     rig_debug(RIG_DEBUG_TRACE, "Event: freq changed to %.0f Hz on %s\n",
               dfreq, rig_strvfo(vfo));
@@ -624,19 +625,19 @@ int rig_fire_freq_event(RIG *rig, vfo_t vfo, freq_t freq)
     // Should work for most other rigs using AI1; mode
     if (RIG_BACKEND_NUM(rig->caps->rig_model) != RIG_ICOM)
     {
-        rig->state.use_cached_freq = 1;
+        rs->use_cached_freq = 1;
     }
 
-    if (rig->state.freq_event_elapsed.tv_sec == 0)
+    if (rs->freq_event_elapsed.tv_sec == 0)
     {
-        elapsed_ms(&rig->state.freq_event_elapsed, HAMLIB_ELAPSED_SET);
+        elapsed_ms(&rs->freq_event_elapsed, HAMLIB_ELAPSED_SET);
     }
 
-    double e = elapsed_ms(&rig->state.freq_event_elapsed, HAMLIB_ELAPSED_GET);
+    double e = elapsed_ms(&rs->freq_event_elapsed, HAMLIB_ELAPSED_GET);
 
     if (e >= 250) // throttle events to 4 per sec
     {
-        elapsed_ms(&rig->state.freq_event_elapsed, HAMLIB_ELAPSED_SET);
+        elapsed_ms(&rs->freq_event_elapsed, HAMLIB_ELAPSED_SET);
         network_publish_rig_transceive_data(rig);
 
         if (rig->callbacks.freq_event)
@@ -663,7 +664,7 @@ int rig_fire_mode_event(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
     // Should work for most other rigs using AI1; mode
     if (RIG_BACKEND_NUM(rig->caps->rig_model) != RIG_ICOM)
     {
-        rig->state.use_cached_mode = 1;
+        STATE(rig)->use_cached_mode = 1;
     }
 
     network_publish_rig_transceive_data(rig);
diff --git a/src/mem.c b/src/mem.c
index 7f460eb33..3b3a64137 100644
--- a/src/mem.c
+++ b/src/mem.c
@@ -44,7 +44,7 @@
 
 #ifndef DOC_HIDDEN
 
-#define CHECK_RIG_ARG(r) (!(r) || !(r)->caps || !(r)->state.comm_state)
+#define CHECK_RIG_ARG(r) (!(r) || !(r)->caps || !STATE(r)->comm_state)
 
 #endif /* !DOC_HIDDEN */
 
@@ -87,7 +87,7 @@ int HAMLIB_API rig_set_mem(RIG *rig, vfo_t vfo, int ch)
 
     if ((caps->targetable_vfo & RIG_TARGETABLE_MEM)
             || vfo == RIG_VFO_CURR
-            || vfo == rig->state.current_vfo)
+            || vfo == STATE(rig)->current_vfo)
     {
         return caps->set_mem(rig, vfo, ch);
     }
@@ -97,7 +97,7 @@ int HAMLIB_API rig_set_mem(RIG *rig, vfo_t vfo, int ch)
         return -RIG_ENTARGET;
     }
 
-    curr_vfo = rig->state.current_vfo;
+    curr_vfo = STATE(rig)->current_vfo;
     retcode = caps->set_vfo(rig, vfo);
 
     if (retcode != RIG_OK)
@@ -150,7 +150,7 @@ int HAMLIB_API rig_get_mem(RIG *rig, vfo_t vfo, int *ch)
 
     if ((caps->targetable_vfo & RIG_TARGETABLE_MEM)
             || vfo == RIG_VFO_CURR
-            || vfo == rig->state.current_vfo)
+            || vfo == STATE(rig)->current_vfo)
     {
         return caps->get_mem(rig, vfo, ch);
     }
@@ -160,7 +160,7 @@ int HAMLIB_API rig_get_mem(RIG *rig, vfo_t vfo, int *ch)
         return -RIG_ENTARGET;
     }
 
-    curr_vfo = rig->state.current_vfo;
+    curr_vfo = STATE(rig)->current_vfo;
     retcode = caps->set_vfo(rig, vfo);
 
     if (retcode != RIG_OK)
@@ -213,7 +213,7 @@ int HAMLIB_API rig_set_bank(RIG *rig, vfo_t vfo, int bank)
 
     if ((caps->targetable_vfo & RIG_TARGETABLE_BANK)
             || vfo == RIG_VFO_CURR
-            || vfo == rig->state.current_vfo)
+            || vfo == STATE(rig)->current_vfo)
     {
         return caps->set_bank(rig, vfo, bank);
     }
@@ -223,7 +223,7 @@ int HAMLIB_API rig_set_bank(RIG *rig, vfo_t vfo, int bank)
         return -RIG_ENTARGET;
     }
 
-    curr_vfo = rig->state.current_vfo;
+    curr_vfo = STATE(rig)->current_vfo;
     retcode = caps->set_vfo(rig, vfo);
 
     if (retcode != RIG_OK)
@@ -727,7 +727,7 @@ int HAMLIB_API rig_set_channel(RIG *rig, vfo_t vfo, const channel_t *chan)
     }
 
     can_emulate_by_vfo_mem = rc->set_vfo
-                             && ((rig->state.vfo_list & RIG_VFO_MEM) == RIG_VFO_MEM);
+                             && ((STATE(rig)->vfo_list & RIG_VFO_MEM) == RIG_VFO_MEM);
 
     can_emulate_by_vfo_op = rc->vfo_op
                             && rig_has_vfo_op(rig, RIG_OP_FROM_VFO);
@@ -737,7 +737,7 @@ int HAMLIB_API rig_set_channel(RIG *rig, vfo_t vfo, const channel_t *chan)
         return -RIG_ENTARGET;
     }
 
-    curr_vfo = rig->state.current_vfo;
+    curr_vfo = STATE(rig)->current_vfo;
 
     if (vfotmp == RIG_VFO_MEM)
     {
@@ -872,7 +872,7 @@ int HAMLIB_API rig_get_channel(RIG *rig, vfo_t vfox, channel_t *chan,
     }
 
     can_emulate_by_vfo_mem = rc->set_vfo
-                             && ((rig->state.vfo_list & RIG_VFO_MEM) == RIG_VFO_MEM);
+                             && ((STATE(rig)->vfo_list & RIG_VFO_MEM) == RIG_VFO_MEM);
 
     can_emulate_by_vfo_op = rc->vfo_op
                             && rig_has_vfo_op(rig, RIG_OP_TO_VFO);
@@ -882,7 +882,7 @@ int HAMLIB_API rig_get_channel(RIG *rig, vfo_t vfox, channel_t *chan,
         return -RIG_ENTARGET;
     }
 
-    curr_vfo = rig->state.current_vfo;
+    curr_vfo = STATE(rig)->current_vfo;
 
     if (vfotmp == RIG_VFO_MEM)
     {
@@ -940,7 +940,7 @@ int get_chan_all_cb_generic(RIG *rig, vfo_t vfo, chan_cb_t chan_cb,
                             rig_ptr_t arg)
 {
     int i, j;
-    chan_t *chan_list = rig->state.chan_list;
+    chan_t *chan_list = STATE(rig)->chan_list;
     channel_t *chan;
 
     for (i = 0; !RIG_IS_CHAN_END(chan_list[i]) && i < HAMLIB_CHANLSTSIZ; i++)
@@ -1006,7 +1006,7 @@ int set_chan_all_cb_generic(RIG *rig, vfo_t vfo, chan_cb_t chan_cb,
                             rig_ptr_t arg)
 {
     int i, j, retval;
-    chan_t *chan_list = rig->state.chan_list;
+    chan_t *chan_list = STATE(rig)->chan_list;
     channel_t *chan;
 
     for (i = 0; !RIG_IS_CHAN_END(chan_list[i]) && i < HAMLIB_CHANLSTSIZ; i++)
@@ -1600,7 +1600,7 @@ const chan_t *HAMLIB_API rig_lookup_mem_caps(RIG *rig, int ch)
     if (ch == RIG_MEM_CAPS_ALL)
     {
         memset(&chan_list_all, 0, sizeof(chan_list_all));
-        chan_list = rig->state.chan_list;
+        chan_list = STATE(rig)->chan_list;
         chan_list_all.startc = chan_list[0].startc;
         chan_list_all.type = RIG_MTYPE_NONE;    /* meaningless */
 
@@ -1626,7 +1626,7 @@ const chan_t *HAMLIB_API rig_lookup_mem_caps(RIG *rig, int ch)
         return &chan_list_all;
     }
 
-    chan_list = rig->state.chan_list;
+    chan_list = STATE(rig)->chan_list;
 
     for (i = 0; i < HAMLIB_CHANLSTSIZ && !RIG_IS_CHAN_END(chan_list[i]); i++)
     {
@@ -1661,7 +1661,7 @@ int HAMLIB_API rig_mem_count(RIG *rig)
         return -RIG_EINVAL;
     }
 
-    chan_list = rig->state.chan_list;
+    chan_list = STATE(rig)->chan_list;
     count = 0;
 
     for (i = 0; i < HAMLIB_CHANLSTSIZ && !RIG_IS_CHAN_END(chan_list[i]); i++)
diff --git a/src/network.c b/src/network.c
index 417f44dc1..87c07cad8 100644
--- a/src/network.c
+++ b/src/network.c
@@ -219,9 +219,9 @@ int network_init()
 }
 
 /**
- * \brief Open network port using rig.state data
+ * \brief Open network port using STATE(rig) data
  *
- * Open Open network port using rig.state data.
+ * Open network port using STATE(rig) data.
  * NB: The signal PIPE will be ignored for the whole application.
  *
  * \param rp Port data structure (must spec port id eg hostname:port)
@@ -781,7 +781,7 @@ retry:
 
 static void multicast_publisher_write_lock(RIG *rig)
 {
-    struct rig_state *rs = &rig->state;
+    struct rig_state *rs = STATE(rig);
     multicast_publisher_priv_data *priv_data = (multicast_publisher_priv_data *)
             rs->multicast_publisher_priv_data;
     pthread_mutex_lock(&priv_data->args.write_lock);
@@ -789,7 +789,7 @@ static void multicast_publisher_write_lock(RIG *rig)
 
 static void multicast_publisher_write_unlock(RIG *rig)
 {
-    struct rig_state *rs = &rig->state;
+    struct rig_state *rs = STATE(rig);
     multicast_publisher_priv_data *priv_data = (multicast_publisher_priv_data *)
             rs->multicast_publisher_priv_data;
     pthread_mutex_unlock(&priv_data->args.write_lock);
@@ -798,7 +798,7 @@ static void multicast_publisher_write_unlock(RIG *rig)
 static int multicast_publisher_write_packet_header(RIG *rig,
         multicast_publisher_data_packet *packet)
 {
-    struct rig_state *rs = &rig->state;
+    struct rig_state *rs = STATE(rig);
     multicast_publisher_priv_data *mcast_publisher_priv;
     multicast_publisher_args *mcast_publisher_args;
     ssize_t result;
@@ -828,7 +828,7 @@ static int multicast_publisher_write_packet_header(RIG *rig,
 // cppcheck-suppress unusedFunction
 int network_publish_rig_poll_data(RIG *rig)
 {
-    const struct rig_state *rs = &rig->state;
+    const struct rig_state *rs = STATE(rig);
     int result;
     multicast_publisher_data_packet packet =
     {
@@ -852,7 +852,7 @@ int network_publish_rig_poll_data(RIG *rig)
 // cppcheck-suppress unusedFunction
 int network_publish_rig_transceive_data(RIG *rig)
 {
-    const struct rig_state *rs = &rig->state;
+    const struct rig_state *rs = STATE(rig);
     int result;
     multicast_publisher_data_packet packet =
     {
@@ -876,7 +876,7 @@ int network_publish_rig_transceive_data(RIG *rig)
 int network_publish_rig_spectrum_data(RIG *rig, struct rig_spectrum_line *line)
 {
     int result;
-    struct rig_state *rs = &rig->state;
+    struct rig_state *rs = STATE(rig);
     multicast_publisher_priv_data *mcast_publisher_priv;
     multicast_publisher_args *mcast_publisher_args;
     multicast_publisher_data_packet packet =
@@ -1006,7 +1006,7 @@ void *multicast_publisher(void *arg)
     struct multicast_publisher_args_s *args = (struct multicast_publisher_args_s *)
             arg;
     RIG *rig = args->rig;
-    struct rig_state *rs = &rig->state;
+    struct rig_state *rs = STATE(rig);
     struct rig_spectrum_line spectrum_line;
     uint8_t packet_type = MULTICAST_PUBLISHER_DATA_PACKET_TYPE_SPECTRUM;
     multicast_publisher_priv_data *mcast_publisher_priv =
@@ -1348,7 +1348,7 @@ void *multicast_receiver(void *arg)
     struct multicast_receiver_args_s *args = (struct multicast_receiver_args_s *)
             arg;
     RIG *rig = args->rig;
-    struct rig_state *rs = &rig->state;
+    struct rig_state *rs = STATE(rig);
     multicast_receiver_priv_data *mcast_receiver_priv =
             (multicast_receiver_priv_data *)
                     rs->multicast_receiver_priv_data;
@@ -1572,7 +1572,7 @@ void *multicast_receiver(void *arg)
 int network_multicast_publisher_start(RIG *rig, const char *multicast_addr,
                                       int multicast_port, enum multicast_item_e items)
 {
-    struct rig_state *rs = &rig->state;
+    struct rig_state *rs = STATE(rig);
     multicast_publisher_priv_data *mcast_publisher_priv;
     int socket_fd;
     int status;
@@ -1729,7 +1729,7 @@ int network_multicast_publisher_start(RIG *rig, const char *multicast_addr,
  */
 int network_multicast_publisher_stop(RIG *rig)
 {
-    struct rig_state *rs = &rig->state;
+    struct rig_state *rs = STATE(rig);
     multicast_publisher_priv_data *mcast_publisher_priv;
 
     ENTERFUNC;
@@ -1787,7 +1787,7 @@ int network_multicast_publisher_stop(RIG *rig)
 int network_multicast_receiver_start(RIG *rig, const char *multicast_addr,
                                      int multicast_port)
 {
-    struct rig_state *rs = &rig->state;
+    struct rig_state *rs = STATE(rig);
     multicast_receiver_priv_data *mcast_receiver_priv;
     int socket_fd;
     int status;
@@ -1897,7 +1897,7 @@ int network_multicast_receiver_start(RIG *rig, const char *multicast_addr,
  */
 int network_multicast_receiver_stop(RIG *rig)
 {
-    struct rig_state *rs = &rig->state;
+    struct rig_state *rs = STATE(rig);
     multicast_receiver_priv_data *mcast_receiver_priv;
 
     ENTERFUNC;
diff --git a/src/serial.c b/src/serial.c
index 302e67b0c..7ed9ff65d 100644
--- a/src/serial.c
+++ b/src/serial.c
@@ -128,7 +128,7 @@ int is_uh_radio_fd(int fd)
 
 
 /**
- * \brief Open serial port using rig.state data
+ * \brief Open serial port using STATE(rig) data
  * \param rp port data structure (must spec port id eg /dev/ttyS1)
  * \return RIG_OK or < 0 if error
  */
diff --git a/src/settings.c b/src/settings.c
index eea32a176..8dfbb6731 100644
--- a/src/settings.c
+++ b/src/settings.c
@@ -48,7 +48,7 @@
 
 #ifndef DOC_HIDDEN
 
-#  define CHECK_RIG_ARG(r) (!(r) || !(r)->caps || !(r)->state.comm_state)
+#  define CHECK_RIG_ARG(r) (!(r) || !(r)->caps || !STATE(r)->comm_state)
 
 #endif /* !DOC_HIDDEN */
 
@@ -92,7 +92,7 @@ int HAMLIB_API rig_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
 
     if ((caps->targetable_vfo & RIG_TARGETABLE_LEVEL)
             || vfo == RIG_VFO_CURR
-            || vfo == rig->state.current_vfo)
+            || vfo == STATE(rig)->current_vfo)
     {
 #if defined(HAVE_PTHREAD)
 
@@ -112,7 +112,7 @@ int HAMLIB_API rig_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
         return -RIG_ENTARGET;
     }
 
-    curr_vfo = rig->state.current_vfo;
+    curr_vfo = STATE(rig)->current_vfo;
     retcode = caps->set_vfo(rig, vfo);
 
     if (retcode != RIG_OK)
@@ -153,6 +153,7 @@ int HAMLIB_API rig_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
 int HAMLIB_API rig_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
 {
     const struct rig_caps *caps;
+    struct rig_state *rs = STATE(rig);
     int retcode;
     vfo_t curr_vfo;
 
@@ -177,7 +178,7 @@ int HAMLIB_API rig_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
     if (level == RIG_LEVEL_STRENGTH
             && (caps->has_get_level & RIG_LEVEL_STRENGTH) == 0
             && rig_has_get_level(rig, RIG_LEVEL_RAWSTR)
-            && rig->state.str_cal.size)
+            && rs->str_cal.size)
     {
 
         value_t rawstr;
@@ -189,14 +190,14 @@ int HAMLIB_API rig_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
             return retcode;
         }
 
-        val->i = (int)rig_raw2val(rawstr.i, &rig->state.str_cal);
+        val->i = (int)rig_raw2val(rawstr.i, &rs->str_cal);
         return RIG_OK;
     }
 
 
     if ((caps->targetable_vfo & RIG_TARGETABLE_LEVEL)
             || vfo == RIG_VFO_CURR
-            || vfo == rig->state.current_vfo)
+            || vfo == rs->current_vfo)
     {
 
         return caps->get_level(rig, vfo, level, val);
@@ -207,7 +208,7 @@ int HAMLIB_API rig_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
         return -RIG_ENTARGET;
     }
 
-    curr_vfo = rig->state.current_vfo;
+    curr_vfo = rs->current_vfo;
     retcode = caps->set_vfo(rig, vfo);
 
     if (retcode != RIG_OK)
@@ -315,7 +316,7 @@ setting_t HAMLIB_API rig_has_get_level(RIG *rig, setting_t level)
         return 0;
     }
 
-    return (rig->state.has_get_level & level);
+    return (STATE(rig)->has_get_level & level);
 }
 
 
@@ -345,7 +346,7 @@ setting_t HAMLIB_API rig_has_set_level(RIG *rig, setting_t level)
         return 0;
     }
 
-    return (rig->state.has_set_level & level);
+    return (STATE(rig)->has_set_level & level);
 }
 
 
@@ -374,7 +375,7 @@ setting_t HAMLIB_API rig_has_get_parm(RIG *rig, setting_t parm)
         return 0;
     }
 
-    return (rig->state.has_get_parm & parm);
+    return (STATE(rig)->has_get_parm & parm);
 }
 
 
@@ -403,7 +404,7 @@ setting_t HAMLIB_API rig_has_set_parm(RIG *rig, setting_t parm)
         return 0;
     }
 
-    return (rig->state.has_set_parm & parm);
+    return (STATE(rig)->has_set_parm & parm);
 }
 
 
@@ -433,7 +434,7 @@ setting_t HAMLIB_API rig_has_get_func(RIG *rig, setting_t func)
         return 0;
     }
 
-    return (rig->state.has_get_func & func);
+    return (STATE(rig)->has_get_func & func);
 }
 
 
@@ -462,7 +463,7 @@ setting_t HAMLIB_API rig_has_set_func(RIG *rig, setting_t func)
         return 0;
     }
 
-    return (rig->state.has_set_func & func);
+    return (STATE(rig)->has_set_func & func);
 }
 
 
@@ -487,6 +488,7 @@ setting_t HAMLIB_API rig_has_set_func(RIG *rig, setting_t func)
 int HAMLIB_API rig_set_func(RIG *rig, vfo_t vfo, setting_t func, int status)
 {
     const struct rig_caps *caps;
+    struct rig_state *rs = STATE(rig);
     int retcode;
     vfo_t curr_vfo;
 
@@ -500,36 +502,36 @@ int HAMLIB_API rig_set_func(RIG *rig, vfo_t vfo, setting_t func, int status)
     caps = rig->caps;
 
     if ((caps->set_func == NULL || !rig_has_set_func(rig, func))
-            && access(rig->state.tuner_control_pathname, X_OK) == -1)
+            && access(rs->tuner_control_pathname, X_OK) == -1)
     {
         return -RIG_ENAVAIL;
     }
 
-    if (access(rig->state.tuner_control_pathname, X_OK) != -1)
+    if (access(rs->tuner_control_pathname, X_OK) != -1)
     {
         char cmd[1024];
-        snprintf(cmd, sizeof(cmd), "%s %d", rig->state.tuner_control_pathname, status);
+        snprintf(cmd, sizeof(cmd), "%s %d", rs->tuner_control_pathname, status);
         rig_debug(RIG_DEBUG_TRACE, "%s: Calling external script '%s'\n", __func__,
-                  rig->state.tuner_control_pathname);
+                  rs->tuner_control_pathname);
         retcode = system(cmd);
 
-        if (retcode != 0) { rig_debug(RIG_DEBUG_ERR, "%s: executing %s failed\n", __func__, rig->state.tuner_control_pathname); }
+        if (retcode != 0) { rig_debug(RIG_DEBUG_ERR, "%s: executing %s failed\n", __func__, rs->tuner_control_pathname); }
 
         return (retcode == 0 ? RIG_OK : -RIG_ERJCTED);
     }
     else
     {
-        if (strcmp(rig->state.tuner_control_pathname, "hamlib_tuner_control"))
+        if (strcmp(rs->tuner_control_pathname, "hamlib_tuner_control"))
         {
             rig_debug(RIG_DEBUG_ERR, "%s: unable to find '%s'\n", __func__,
-                      rig->state.tuner_control_pathname);
+                      rs->tuner_control_pathname);
             return -RIG_EINVAL;
         }
     }
 
     if ((caps->targetable_vfo & RIG_TARGETABLE_FUNC)
             || vfo == RIG_VFO_CURR
-            || vfo == rig->state.current_vfo)
+            || vfo == rs->current_vfo)
     {
 
         return caps->set_func(rig, vfo, func, status);
@@ -538,7 +540,7 @@ int HAMLIB_API rig_set_func(RIG *rig, vfo_t vfo, setting_t func, int status)
     {
         int targetable = caps->targetable_vfo & RIG_TARGETABLE_FUNC;
         rig_debug(RIG_DEBUG_TRACE, "%s: targetable=%d, vfo=%s, currvfo=%s\n", __func__,
-                  targetable, rig_strvfo(vfo), rig_strvfo(rig->state.current_vfo));
+                  targetable, rig_strvfo(vfo), rig_strvfo(rs->current_vfo));
     }
 
     if (!caps->set_vfo)
@@ -546,7 +548,7 @@ int HAMLIB_API rig_set_func(RIG *rig, vfo_t vfo, setting_t func, int status)
         return -RIG_ENTARGET;
     }
 
-    curr_vfo = rig->state.current_vfo;
+    curr_vfo = rs->current_vfo;
     retcode = caps->set_vfo(rig, vfo);
 
     if (retcode != RIG_OK)
@@ -583,6 +585,7 @@ int HAMLIB_API rig_set_func(RIG *rig, vfo_t vfo, setting_t func, int status)
 int HAMLIB_API rig_get_func(RIG *rig, vfo_t vfo, setting_t func, int *status)
 {
     const struct rig_caps *caps;
+    struct rig_state *rs = STATE(rig);
     int retcode;
     vfo_t curr_vfo;
 
@@ -603,7 +606,7 @@ int HAMLIB_API rig_get_func(RIG *rig, vfo_t vfo, setting_t func, int *status)
 
     if ((caps->targetable_vfo & RIG_TARGETABLE_FUNC)
             || vfo == RIG_VFO_CURR
-            || vfo == rig->state.current_vfo)
+            || vfo == rs->current_vfo)
     {
 
         return caps->get_func(rig, vfo, func, status);
@@ -614,7 +617,7 @@ int HAMLIB_API rig_get_func(RIG *rig, vfo_t vfo, setting_t func, int *status)
         return -RIG_ENTARGET;
     }
 
-    curr_vfo = rig->state.current_vfo;
+    curr_vfo = rs->current_vfo;
     retcode = caps->set_vfo(rig, vfo);
 
     if (retcode != RIG_OK)
@@ -669,7 +672,7 @@ int HAMLIB_API rig_set_ext_level(RIG *rig,
 
     if ((caps->targetable_vfo & RIG_TARGETABLE_LEVEL)
             || vfo == RIG_VFO_CURR
-            || vfo == rig->state.current_vfo)
+            || vfo == STATE(rig)->current_vfo)
     {
 
         return caps->set_ext_level(rig, vfo, token, val);
@@ -680,7 +683,7 @@ int HAMLIB_API rig_set_ext_level(RIG *rig,
         return -RIG_ENTARGET;
     }
 
-    curr_vfo = rig->state.current_vfo;
+    curr_vfo = STATE(rig)->current_vfo;
     retcode = caps->set_vfo(rig, vfo);
 
     if (retcode != RIG_OK)
@@ -735,7 +738,7 @@ int HAMLIB_API rig_get_ext_level(RIG *rig,
 
     if ((caps->targetable_vfo & RIG_TARGETABLE_LEVEL)
             || vfo == RIG_VFO_CURR
-            || vfo == rig->state.current_vfo)
+            || vfo == STATE(rig)->current_vfo)
     {
 
         return caps->get_ext_level(rig, vfo, token, val);
@@ -746,7 +749,7 @@ int HAMLIB_API rig_get_ext_level(RIG *rig,
         return -RIG_ENTARGET;
     }
 
-    curr_vfo = rig->state.current_vfo;
+    curr_vfo = STATE(rig)->current_vfo;
     retcode = caps->set_vfo(rig, vfo);
 
     if (retcode != RIG_OK)
@@ -800,7 +803,7 @@ int HAMLIB_API rig_set_ext_func(RIG *rig,
 
     if ((caps->targetable_vfo & RIG_TARGETABLE_FUNC)
             || vfo == RIG_VFO_CURR
-            || vfo == rig->state.current_vfo)
+            || vfo == STATE(rig)->current_vfo)
     {
 
         return caps->set_ext_func(rig, vfo, token, status);
@@ -811,7 +814,7 @@ int HAMLIB_API rig_set_ext_func(RIG *rig,
         return -RIG_ENTARGET;
     }
 
-    curr_vfo = rig->state.current_vfo;
+    curr_vfo = STATE(rig)->current_vfo;
     retcode = caps->set_vfo(rig, vfo);
 
     if (retcode != RIG_OK)
@@ -866,7 +869,7 @@ int HAMLIB_API rig_get_ext_func(RIG *rig,
 
     if ((caps->targetable_vfo & RIG_TARGETABLE_FUNC)
             || vfo == RIG_VFO_CURR
-            || vfo == rig->state.current_vfo)
+            || vfo == STATE(rig)->current_vfo)
     {
 
         return caps->get_ext_func(rig, vfo, token, status);
@@ -877,7 +880,7 @@ int HAMLIB_API rig_get_ext_func(RIG *rig,
         return -RIG_ENTARGET;
     }
 
-    curr_vfo = rig->state.current_vfo;
+    curr_vfo = STATE(rig)->current_vfo;
     retcode = caps->set_vfo(rig, vfo);
 
     if (retcode != RIG_OK)