diff --git a/src/devices/sound/pokey.cpp b/src/devices/sound/pokey.cpp
index 43e8d6f3398..3b174c22766 100644
--- a/src/devices/sound/pokey.cpp
+++ b/src/devices/sound/pokey.cpp
@@ -263,15 +263,12 @@ void pokey_device::device_start()
 	timer_alloc(SYNC_POT);
 	timer_alloc(SYNC_SET_IRQST);
 
-	for (int i=0; i<POKEY_CHANNELS; i++)
-	{
-		save_item(NAME(m_channel[i].m_borrow_cnt), i);
-		save_item(NAME(m_channel[i].m_counter), i);
-		save_item(NAME(m_channel[i].m_filter_sample), i);
-		save_item(NAME(m_channel[i].m_output), i);
-		save_item(NAME(m_channel[i].m_AUDF), i);
-		save_item(NAME(m_channel[i].m_AUDC), i);
-	}
+	save_item(STRUCT_MEMBER(m_channel, m_borrow_cnt));
+	save_item(STRUCT_MEMBER(m_channel, m_counter));
+	save_item(STRUCT_MEMBER(m_channel, m_filter_sample));
+	save_item(STRUCT_MEMBER(m_channel, m_output));
+	save_item(STRUCT_MEMBER(m_channel, m_AUDF));
+	save_item(STRUCT_MEMBER(m_channel, m_AUDC));
 
 	save_item(NAME(m_clock_cnt));
 	save_item(NAME(m_p4));
diff --git a/src/devices/sound/ym2151.cpp b/src/devices/sound/ym2151.cpp
index 3a5b1076c00..f57370f7cb6 100644
--- a/src/devices/sound/ym2151.cpp
+++ b/src/devices/sound/ym2151.cpp
@@ -965,51 +965,46 @@ void ym2151_device::device_start()
 	irqlinestate = 0;
 
 	/* save all 32 operators */
-	for (int j=0; j<32; j++)
-	{
-		YM2151Operator &op = oper[(j&7)*4+(j>>3)];
+	save_item(STRUCT_MEMBER(oper, phase));
+	save_item(STRUCT_MEMBER(oper, freq));
+	save_item(STRUCT_MEMBER(oper, dt1));
+	save_item(STRUCT_MEMBER(oper, mul));
+	save_item(STRUCT_MEMBER(oper, dt1_i));
+	save_item(STRUCT_MEMBER(oper, dt2));
+	/* operators connection is saved in chip data block */
+	save_item(STRUCT_MEMBER(oper, mem_value));
 
-		save_item(NAME(op.phase), j);
-		save_item(NAME(op.freq), j);
-		save_item(NAME(op.dt1), j);
-		save_item(NAME(op.mul), j);
-		save_item(NAME(op.dt1_i), j);
-		save_item(NAME(op.dt2), j);
-		/* operators connection is saved in chip data block */
-		save_item(NAME(op.mem_value), j);
+	save_item(STRUCT_MEMBER(oper, fb_shift));
+	save_item(STRUCT_MEMBER(oper, fb_out_curr));
+	save_item(STRUCT_MEMBER(oper, fb_out_prev));
+	save_item(STRUCT_MEMBER(oper, kc));
+	save_item(STRUCT_MEMBER(oper, kc_i));
+	save_item(STRUCT_MEMBER(oper, pms));
+	save_item(STRUCT_MEMBER(oper, ams));
+	save_item(STRUCT_MEMBER(oper, AMmask));
 
-		save_item(NAME(op.fb_shift), j);
-		save_item(NAME(op.fb_out_curr), j);
-		save_item(NAME(op.fb_out_prev), j);
-		save_item(NAME(op.kc), j);
-		save_item(NAME(op.kc_i), j);
-		save_item(NAME(op.pms), j);
-		save_item(NAME(op.ams), j);
-		save_item(NAME(op.AMmask), j);
+	save_item(STRUCT_MEMBER(oper, state));
+	save_item(STRUCT_MEMBER(oper, eg_sh_ar));
+	save_item(STRUCT_MEMBER(oper, eg_sel_ar));
+	save_item(STRUCT_MEMBER(oper, tl));
+	save_item(STRUCT_MEMBER(oper, volume));
+	save_item(STRUCT_MEMBER(oper, eg_sh_d1r));
+	save_item(STRUCT_MEMBER(oper, eg_sel_d1r));
+	save_item(STRUCT_MEMBER(oper, d1l));
+	save_item(STRUCT_MEMBER(oper, eg_sh_d2r));
+	save_item(STRUCT_MEMBER(oper, eg_sel_d2r));
+	save_item(STRUCT_MEMBER(oper, eg_sh_rr));
+	save_item(STRUCT_MEMBER(oper, eg_sel_rr));
 
-		save_item(NAME(op.state), j);
-		save_item(NAME(op.eg_sh_ar), j);
-		save_item(NAME(op.eg_sel_ar), j);
-		save_item(NAME(op.tl), j);
-		save_item(NAME(op.volume), j);
-		save_item(NAME(op.eg_sh_d1r), j);
-		save_item(NAME(op.eg_sel_d1r), j);
-		save_item(NAME(op.d1l), j);
-		save_item(NAME(op.eg_sh_d2r), j);
-		save_item(NAME(op.eg_sel_d2r), j);
-		save_item(NAME(op.eg_sh_rr), j);
-		save_item(NAME(op.eg_sel_rr), j);
+	save_item(STRUCT_MEMBER(oper, key));
+	save_item(STRUCT_MEMBER(oper, ks));
+	save_item(STRUCT_MEMBER(oper, ar));
+	save_item(STRUCT_MEMBER(oper, d1r));
+	save_item(STRUCT_MEMBER(oper, d2r));
+	save_item(STRUCT_MEMBER(oper, rr));
 
-		save_item(NAME(op.key), j);
-		save_item(NAME(op.ks), j);
-		save_item(NAME(op.ar), j);
-		save_item(NAME(op.d1r), j);
-		save_item(NAME(op.d2r), j);
-		save_item(NAME(op.rr), j);
-
-		save_item(NAME(op.reserved0), j);
-		save_item(NAME(op.reserved1), j);
-	}
+	save_item(STRUCT_MEMBER(oper, reserved0));
+	save_item(STRUCT_MEMBER(oper, reserved1));
 
 	save_item(NAME(pan));