Stop allocating arrays of UINT8s for the tokens, when

we can allocate objects of the real type.

src/emu/imagedev/flopdrv.c

@@ -868,7 +868,7 @@ legacy_floppy_image_device::legacy_floppy_image_device(const machine_config &mco
 	  device_image_interface(mconfig, *this),
 	  m_token(NULL)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(floppy_drive));
+	m_token = global_alloc_clear(floppy_drive);
 }
 
 legacy_floppy_image_device::legacy_floppy_image_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock)
@@ -876,7 +876,7 @@ legacy_floppy_image_device::legacy_floppy_image_device(const machine_config &mco
 	  device_image_interface(mconfig, *this),
 	  m_token(NULL)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(floppy_drive));
+	m_token = global_alloc_clear(floppy_drive);
 }
 
 //-------------------------------------------------

src/emu/machine/6525tpi.c

@@ -600,7 +600,7 @@ const device_type TPI6525 = &device_creator<tpi6525_device>;
 tpi6525_device::tpi6525_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
 	: device_t(mconfig, TPI6525, "6525 TPI", tag, owner, clock)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(tpi6525_state));
+	m_token = global_alloc_clear(tpi6525_state);
 }
 
 //-------------------------------------------------

src/emu/machine/68681.c

@@ -908,7 +908,7 @@ const device_type DUART68681 = &device_creator<duart68681_device>;
 duart68681_device::duart68681_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
 	: device_t(mconfig, DUART68681, "DUART 68681", tag, owner, clock)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(duart68681_state));
+	m_token = global_alloc_clear(duart68681_state);
 }
 
 //-------------------------------------------------

src/emu/machine/74148.c

@@ -218,7 +218,7 @@ const device_type TTL74148 = &device_creator<ttl74148_device>;
 ttl74148_device::ttl74148_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
 	: device_t(mconfig, TTL74148, "74148", tag, owner, clock)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(ttl74148_state));
+	m_token = global_alloc_clear(ttl74148_state);
 }
 
 //-------------------------------------------------

src/emu/machine/74153.c

@@ -180,7 +180,7 @@ const device_type TTL74153 = &device_creator<ttl74153_device>;
 ttl74153_device::ttl74153_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
 	: device_t(mconfig, TTL74153, "74153", tag, owner, clock)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(ttl74153_state));
+	m_token = global_alloc_clear(ttl74153_state);
 }
 
 //-------------------------------------------------

src/emu/machine/adc083x.c

@@ -509,12 +509,12 @@ const device_type ADC0831 = &device_creator<adc0831_device>;
 adc0831_device::adc0831_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
 	: device_t(mconfig, ADC0831, "A/D Converters 0831", tag, owner, clock)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(adc0831_state));
+	m_token = global_alloc_clear(adc0831_state);
 }
 adc0831_device::adc0831_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock)
 	: device_t(mconfig, type, name, tag, owner, clock)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(adc0831_state));
+	m_token = global_alloc_clear(adc0831_state);
 }
 
 //-------------------------------------------------

src/emu/machine/adc1038.c

@@ -162,7 +162,7 @@ const device_type ADC1038 = &device_creator<adc1038_device>;
 adc1038_device::adc1038_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
 	: device_t(mconfig, ADC1038, "A/D Converters 1038", tag, owner, clock)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(adc1038_state));
+	m_token = global_alloc_clear(adc1038_state);
 }
 
 //-------------------------------------------------

src/emu/machine/adc1213x.c

@@ -374,12 +374,12 @@ const device_type ADC12138 = &device_creator<adc12138_device>;
 adc12138_device::adc12138_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
 	: device_t(mconfig, ADC12138, "A/D Converter 12138", tag, owner, clock)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(adc12138_state));
+	m_token = global_alloc_clear(adc12138_state);
 }
 adc12138_device::adc12138_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock)
 	: device_t(mconfig, type, name, tag, owner, clock)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(adc12138_state));
+	m_token = global_alloc_clear(adc12138_state);
 }
 
 //-------------------------------------------------

src/emu/machine/idectrl.c

@@ -1948,7 +1948,7 @@ const device_type IDE_CONTROLLER = &device_creator<ide_controller_device>;
 ide_controller_device::ide_controller_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
 	: device_t(mconfig, IDE_CONTROLLER, "IDE Controller", tag, owner, clock)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(ide_state));
+	m_token = global_alloc_clear(ide_state);
 }
 
 //-------------------------------------------------

src/emu/machine/k053252.c

@@ -235,7 +235,7 @@ const device_type K053252 = &device_creator<k053252_device>;
 k053252_device::k053252_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
 	: device_t(mconfig, K053252, "Konami 053252", tag, owner, clock)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(k053252_state));
+	m_token = global_alloc_clear(k053252_state);
 }
 
 //-------------------------------------------------

src/emu/machine/latch8.c

@@ -236,7 +236,7 @@ const device_type LATCH8 = &device_creator<latch8_device>;
 latch8_device::latch8_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
        : device_t(mconfig, LATCH8, "8 bit latch", tag, owner, clock)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(latch8_t));
+	m_token = global_alloc_clear(latch8_t);
 	memset((void*)&m_inline_config,0,sizeof(m_inline_config));
 }
 

src/emu/machine/mb14241.c

@@ -72,7 +72,7 @@ const device_type MB14241 = &device_creator<mb14241_device>;
 mb14241_device::mb14241_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
 	: device_t(mconfig, MB14241, "MB14241", tag, owner, clock)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(mb14241_state));
+	m_token = global_alloc_clear(mb14241_state);
 }
 
 //-------------------------------------------------

src/emu/machine/mb87078.c

@@ -270,7 +270,7 @@ const device_type MB87078 = &device_creator<mb87078_device>;
 mb87078_device::mb87078_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
 	: device_t(mconfig, MB87078, "Fujitsu MB87078", tag, owner, clock)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(mb87078_state));
+	m_token = global_alloc_clear(mb87078_state);
 }
 
 //-------------------------------------------------

src/emu/machine/pd4990a.c

@@ -525,7 +525,7 @@ const device_type UPD4990A = &device_creator<upd4990a_device>;
 upd4990a_device::upd4990a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
 	: device_t(mconfig, UPD4990A, "NEC uPD4990A", tag, owner, clock)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(upd4990a_state));
+	m_token = global_alloc_clear(upd4990a_state);
 }
 
 //-------------------------------------------------

src/emu/machine/pic8259.c

@@ -451,7 +451,7 @@ const device_type PIC8259 = &device_creator<pic8259_device>;
 pic8259_device::pic8259_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
 	: device_t(mconfig, PIC8259, "Intel PIC8259", tag, owner, clock)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(pic8259_t));
+	m_token = global_alloc_clear(pic8259_t);
 }
 
 //-------------------------------------------------

src/emu/machine/pit8253.c

@@ -1158,12 +1158,12 @@ const device_type PIT8253 = &device_creator<pit8253_device>;
 pit8253_device::pit8253_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
 	: device_t(mconfig, PIT8253, "Intel PIT8253", tag, owner, clock)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(pit8253_t));
+	m_token = global_alloc_clear(pit8253_t);
 }
 pit8253_device::pit8253_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock)
 	: device_t(mconfig, type, name, tag, owner, clock)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(pit8253_t));
+	m_token = global_alloc_clear(pit8253_t);
 }
 
 //-------------------------------------------------

src/emu/machine/rp5h01.c

@@ -226,7 +226,7 @@ const device_type RP5H01 = &device_creator<rp5h01_device>;
 rp5h01_device::rp5h01_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
 	: device_t(mconfig, RP5H01, "RP5H01", tag, owner, clock)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(rp5h01_state));
+	m_token = global_alloc_clear(rp5h01_state);
 }
 
 //-------------------------------------------------

src/emu/machine/s3c2400.c

@@ -71,7 +71,7 @@ const device_type S3C2400 = &device_creator<s3c2400_device>;
 s3c2400_device::s3c2400_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
        : device_t(mconfig, S3C2400, "Samsung S3C2400", tag, owner, clock)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(s3c24xx_t));
+	m_token = global_alloc_clear(s3c24xx_t);
 }
 
 //-------------------------------------------------

src/emu/machine/s3c2410.c

@@ -74,7 +74,7 @@ const device_type S3C2410 = &device_creator<s3c2410_device>;
 s3c2410_device::s3c2410_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
        : device_t(mconfig, S3C2410, "Samsung S3C2410", tag, owner, clock)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(s3c24xx_t));
+	m_token = global_alloc_clear(s3c24xx_t);
 }
 
 //-------------------------------------------------

src/emu/machine/s3c2440.c

@@ -76,7 +76,7 @@ const device_type S3C2440 = &device_creator<s3c2440_device>;
 s3c2440_device::s3c2440_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
        : device_t(mconfig, S3C2440, "Samsung S3C2440", tag, owner, clock)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(s3c24xx_t));
+	m_token = global_alloc_clear(s3c24xx_t);
 }
 
 //-------------------------------------------------

src/emu/machine/smc91c9x.c

@@ -586,7 +586,7 @@ static DEVICE_RESET( smc91c9x )
 smc91c9x_device::smc91c9x_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock)
 	: device_t(mconfig, type, name, tag, owner, clock)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(smc91c9x_state));
+	m_token = global_alloc_clear(smc91c9x_state);
 }
 
 //-------------------------------------------------

src/emu/machine/tms6100.c

@@ -264,12 +264,12 @@ const device_type TMS6100 = &device_creator<tms6100_device>;
 tms6100_device::tms6100_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
 	: device_t(mconfig, TMS6100, "TMS6100", tag, owner, clock)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(tms6100_state));
+	m_token = global_alloc_clear(tms6100_state);
 }
 tms6100_device::tms6100_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock)
 	: device_t(mconfig, type, name, tag, owner, clock)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(tms6100_state));
+	m_token = global_alloc_clear(tms6100_state);
 }
 
 //-------------------------------------------------

src/emu/machine/upd4701.c

@@ -305,7 +305,7 @@ const device_type UPD4701 = &device_creator<upd4701_device>;
 upd4701_device::upd4701_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
 	: device_t(mconfig, UPD4701, "NEC uPD4701 Encoder", tag, owner, clock)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(upd4701_state));
+	m_token = global_alloc_clear(upd4701_state);
 }
 
 //-------------------------------------------------

src/emu/machine/wd17xx.c

@@ -2247,12 +2247,12 @@ const device_type WD1770 = &device_creator<wd1770_device>;
 wd1770_device::wd1770_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
 	: device_t(mconfig, WD1770, "WD1770", tag, owner, clock)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(wd1770_state));
+	m_token = global_alloc_clear(wd1770_state);
 }
 wd1770_device::wd1770_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock)
 	: device_t(mconfig, type, name, tag, owner, clock)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(wd1770_state));
+	m_token = global_alloc_clear(wd1770_state);
 }
 
 //-------------------------------------------------

src/emu/sound/2151intf.c

@@ -124,7 +124,7 @@ ym2151_device::ym2151_device(const machine_config &mconfig, const char *tag, dev
 	: device_t(mconfig, YM2151, "YM2151", tag, owner, clock),
 	  device_sound_interface(mconfig, *this)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(ym2151_state));
+	m_token = global_alloc_clear(ym2151_state);
 }
 
 //-------------------------------------------------

src/emu/sound/2203intf.c

@@ -186,7 +186,7 @@ ym2203_device::ym2203_device(const machine_config &mconfig, const char *tag, dev
 	: device_t(mconfig, YM2203, "YM2203", tag, owner, clock),
 	  device_sound_interface(mconfig, *this)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(ym2203_state));
+	m_token = global_alloc_clear(ym2203_state);
 }
 
 //-------------------------------------------------

src/emu/sound/2413intf.c

@@ -120,7 +120,7 @@ ym2413_device::ym2413_device(const machine_config &mconfig, const char *tag, dev
 	: device_t(mconfig, YM2413, "YM2413", tag, owner, clock),
 	  device_sound_interface(mconfig, *this)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(ym2413_state));
+	m_token = global_alloc_clear(ym2413_state);
 }
 
 //-------------------------------------------------

src/emu/sound/2608intf.c

@@ -209,7 +209,7 @@ ym2608_device::ym2608_device(const machine_config &mconfig, const char *tag, dev
 	: device_t(mconfig, YM2608, "YM2608", tag, owner, clock),
 	  device_sound_interface(mconfig, *this)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(ym2608_state));
+	m_token = global_alloc_clear(ym2608_state);
 }
 
 //-------------------------------------------------

src/emu/sound/2610intf.c

@@ -222,13 +222,13 @@ ym2610_device::ym2610_device(const machine_config &mconfig, const char *tag, dev
 	: device_t(mconfig, YM2610, "YM2610", tag, owner, clock),
 	  device_sound_interface(mconfig, *this)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(ym2610_state));
+	m_token = global_alloc_clear(ym2610_state);
 }
 ym2610_device::ym2610_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock)
 	: device_t(mconfig, type, name, tag, owner, clock),
 	  device_sound_interface(mconfig, *this)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(ym2610_state));
+	m_token = global_alloc_clear(ym2610_state);
 }
 
 //-------------------------------------------------

src/emu/sound/2612intf.c

@@ -162,13 +162,13 @@ ym2612_device::ym2612_device(const machine_config &mconfig, const char *tag, dev
 	: device_t(mconfig, YM2612, "YM2612", tag, owner, clock),
 	  device_sound_interface(mconfig, *this)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(ym2612_state));
+	m_token = global_alloc_clear(ym2612_state);
 }
 ym2612_device::ym2612_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock)
 	: device_t(mconfig, type, name, tag, owner, clock),
 	  device_sound_interface(mconfig, *this)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(ym2612_state));
+	m_token = global_alloc_clear(ym2612_state);
 }
 
 //-------------------------------------------------

src/emu/sound/262intf.c

@@ -136,7 +136,7 @@ ymf262_device::ymf262_device(const machine_config &mconfig, const char *tag, dev
 	: device_t(mconfig, YMF262, "YMF262", tag, owner, clock),
 	  device_sound_interface(mconfig, *this)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(ymf262_state));
+	m_token = global_alloc_clear(ymf262_state);
 }
 
 //-------------------------------------------------

src/emu/sound/3526intf.c

@@ -150,7 +150,7 @@ ym3526_device::ym3526_device(const machine_config &mconfig, const char *tag, dev
 	: device_t(mconfig, YM3526, "YM3526", tag, owner, clock),
 	  device_sound_interface(mconfig, *this)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(ym3526_state));
+	m_token = global_alloc_clear(ym3526_state);
 }
 
 //-------------------------------------------------

src/emu/sound/3812intf.c

@@ -146,7 +146,7 @@ ym3812_device::ym3812_device(const machine_config &mconfig, const char *tag, dev
 	: device_t(mconfig, YM3812, "YM3812", tag, owner, clock),
 	  device_sound_interface(mconfig, *this)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(ym3812_state));
+	m_token = global_alloc_clear(ym3812_state);
 }
 
 //-------------------------------------------------

src/emu/sound/8950intf.c

@@ -179,7 +179,7 @@ y8950_device::y8950_device(const machine_config &mconfig, const char *tag, devic
 	: device_t(mconfig, Y8950, "Y8950", tag, owner, clock),
 	  device_sound_interface(mconfig, *this)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(y8950_state));
+	m_token = global_alloc_clear(y8950_state);
 }
 
 //-------------------------------------------------

src/emu/sound/aica.c

@@ -1359,7 +1359,7 @@ aica_device::aica_device(const machine_config &mconfig, const char *tag, device_
 	: device_t(mconfig, AICA, "AICA", tag, owner, clock),
 	  device_sound_interface(mconfig, *this)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(aica_state));
+	m_token = global_alloc_clear(aica_state);
 }
 
 //-------------------------------------------------

src/emu/sound/astrocde.c

@@ -307,7 +307,7 @@ astrocade_device::astrocade_device(const machine_config &mconfig, const char *ta
 	: device_t(mconfig, ASTROCADE, "Astrocade", tag, owner, clock),
 	  device_sound_interface(mconfig, *this)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(astrocade_state));
+	m_token = global_alloc_clear(astrocade_state);
 }
 
 //-------------------------------------------------

src/emu/sound/ay8910.c

@@ -1042,13 +1042,13 @@ ay8910_device::ay8910_device(const machine_config &mconfig, const char *tag, dev
 	: device_t(mconfig, AY8910, "AY-3-8910A", tag, owner, clock),
 	  device_sound_interface(mconfig, *this)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(ay8910_context));
+	m_token = global_alloc_clear(ay8910_context);
 }
 ay8910_device::ay8910_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock)
 	: device_t(mconfig, type, name, tag, owner, clock),
 	  device_sound_interface(mconfig, *this)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(ay8910_context));
+	m_token = global_alloc_clear(ay8910_context);
 }
 
 //-------------------------------------------------

src/emu/sound/beep.c

@@ -168,7 +168,7 @@ beep_device::beep_device(const machine_config &mconfig, const char *tag, device_
 	: device_t(mconfig, BEEP, "Beep", tag, owner, clock),
 	  device_sound_interface(mconfig, *this)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(beep_state));
+	m_token = global_alloc_clear(beep_state);
 }
 
 //-------------------------------------------------

src/emu/sound/c140.c

@@ -480,7 +480,7 @@ c140_device::c140_device(const machine_config &mconfig, const char *tag, device_
 	: device_t(mconfig, C140, "C140", tag, owner, clock),
 	  device_sound_interface(mconfig, *this)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(c140_state));
+	m_token = global_alloc_clear(c140_state);
 }
 
 //-------------------------------------------------

src/emu/sound/c6280.c

@@ -350,7 +350,7 @@ c6280_device::c6280_device(const machine_config &mconfig, const char *tag, devic
 	: device_t(mconfig, C6280, "HuC6280", tag, owner, clock),
 	  device_sound_interface(mconfig, *this)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(c6280_t));
+	m_token = global_alloc_clear(c6280_t);
 }
 
 //-------------------------------------------------

src/emu/sound/cdda.c

@@ -318,7 +318,7 @@ cdda_device::cdda_device(const machine_config &mconfig, const char *tag, device_
 	: device_t(mconfig, CDDA, "CD/DA", tag, owner, clock),
 	  device_sound_interface(mconfig, *this)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(cdda_info));
+	m_token = global_alloc_clear(cdda_info);
 }
 
 //-------------------------------------------------

src/emu/sound/cem3394.c

@@ -562,7 +562,7 @@ cem3394_device::cem3394_device(const machine_config &mconfig, const char *tag, d
 	: device_t(mconfig, CEM3394, "CEM3394", tag, owner, clock),
 	  device_sound_interface(mconfig, *this)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(cem3394_state));
+	m_token = global_alloc_clear(cem3394_state);
 }
 
 //-------------------------------------------------

src/emu/sound/digitalk.c

@@ -696,7 +696,7 @@ digitalker_device::digitalker_device(const machine_config &mconfig, const char *
 	: device_t(mconfig, DIGITALKER, "Digitalker", tag, owner, clock),
 	  device_sound_interface(mconfig, *this)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(digitalker));
+	m_token = global_alloc_clear(digitalker);
 }
 
 //-------------------------------------------------

src/emu/sound/dmadac.c

@@ -239,7 +239,7 @@ dmadac_sound_device::dmadac_sound_device(const machine_config &mconfig, const ch
 	: device_t(mconfig, DMADAC, "DMA-driven DAC", tag, owner, clock),
 	  device_sound_interface(mconfig, *this)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(dmadac_state));
+	m_token = global_alloc_clear(dmadac_state);
 }
 
 //-------------------------------------------------

src/emu/sound/es5506.c

@@ -2137,14 +2137,14 @@ es5506_device::es5506_device(const machine_config &mconfig, const char *tag, dev
 	: device_t(mconfig, ES5506, "ES5506", tag, owner, clock),
 	  device_sound_interface(mconfig, *this)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(es5506_state));
+	m_token = global_alloc_clear(es5506_state);
 }
 
 es5506_device::es5506_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock)
 	: device_t(mconfig, type, name, tag, owner, clock),
 	  device_sound_interface(mconfig, *this)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(es5506_state));
+	m_token = global_alloc_clear(es5506_state);
 }
 
 //-------------------------------------------------

src/emu/sound/es8712.c

@@ -384,7 +384,7 @@ es8712_device::es8712_device(const machine_config &mconfig, const char *tag, dev
 	: device_t(mconfig, ES8712, "ES8712", tag, owner, clock),
 	  device_sound_interface(mconfig, *this)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(es8712_state));
+	m_token = global_alloc_clear(es8712_state);
 }
 
 //-------------------------------------------------

src/emu/sound/flt_rc.c

@@ -116,7 +116,7 @@ filter_rc_device::filter_rc_device(const machine_config &mconfig, const char *ta
 	: device_t(mconfig, FILTER_RC, "RC Filter", tag, owner, clock),
 	  device_sound_interface(mconfig, *this)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(filter_rc_state));
+	m_token = global_alloc_clear(filter_rc_state);
 }
 
 //-------------------------------------------------

src/emu/sound/flt_vol.c

@@ -49,7 +49,7 @@ filter_volume_device::filter_volume_device(const machine_config &mconfig, const
 	: device_t(mconfig, FILTER_VOLUME, "Volume Filter", tag, owner, clock),
 	  device_sound_interface(mconfig, *this)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(filter_volume_state));
+	m_token = global_alloc_clear(filter_volume_state);
 }
 
 //-------------------------------------------------

src/emu/sound/gaelco.c

@@ -288,14 +288,14 @@ gaelco_gae1_device::gaelco_gae1_device(const machine_config &mconfig, const char
 	: device_t(mconfig, GAELCO_GAE1, "Gaelco GAE1", tag, owner, clock),
 	  device_sound_interface(mconfig, *this)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(gaelco_sound_state));
+	m_token = global_alloc_clear(gaelco_sound_state);
 }
 
 gaelco_gae1_device::gaelco_gae1_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock)
 	: device_t(mconfig, type, name, tag, owner, clock),
 	  device_sound_interface(mconfig, *this)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(gaelco_sound_state));
+	m_token = global_alloc_clear(gaelco_sound_state);
 }
 
 //-------------------------------------------------

src/emu/sound/hc55516.c

@@ -299,13 +299,13 @@ hc55516_device::hc55516_device(const machine_config &mconfig, const char *tag, d
 	: device_t(mconfig, HC55516, "HC-55516", tag, owner, clock),
 	  device_sound_interface(mconfig, *this)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(hc55516_state));
+	m_token = global_alloc_clear(hc55516_state);
 }
 hc55516_device::hc55516_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock)
 	: device_t(mconfig, type, name, tag, owner, clock),
 	  device_sound_interface(mconfig, *this)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(hc55516_state));
+	m_token = global_alloc_clear(hc55516_state);
 }
 
 //-------------------------------------------------

src/emu/sound/iremga20.c

@@ -269,7 +269,7 @@ iremga20_device::iremga20_device(const machine_config &mconfig, const char *tag,
 	: device_t(mconfig, IREMGA20, "Irem GA20", tag, owner, clock),
 	  device_sound_interface(mconfig, *this)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(ga20_state));
+	m_token = global_alloc_clear(ga20_state);
 }
 
 //-------------------------------------------------

src/emu/sound/k005289.c

@@ -250,7 +250,7 @@ k005289_device::k005289_device(const machine_config &mconfig, const char *tag, d
 	: device_t(mconfig, K005289, "K005289", tag, owner, clock),
 	  device_sound_interface(mconfig, *this)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(k005289_state));
+	m_token = global_alloc_clear(k005289_state);
 }
 
 //-------------------------------------------------

src/emu/sound/k007232.c

@@ -449,7 +449,7 @@ k007232_device::k007232_device(const machine_config &mconfig, const char *tag, d
 	: device_t(mconfig, K007232, "K007232", tag, owner, clock),
 	  device_sound_interface(mconfig, *this)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(KDAC_A_PCM));
+	m_token = global_alloc_clear(KDAC_A_PCM);
 }
 
 //-------------------------------------------------

src/emu/sound/k051649.c

@@ -286,7 +286,7 @@ k051649_device::k051649_device(const machine_config &mconfig, const char *tag, d
 	: device_t(mconfig, K051649, "K051649", tag, owner, clock),
 	  device_sound_interface(mconfig, *this)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(k051649_state));
+	m_token = global_alloc_clear(k051649_state);
 }
 
 //-------------------------------------------------

src/emu/sound/k053260.c

@@ -441,7 +441,7 @@ k053260_device::k053260_device(const machine_config &mconfig, const char *tag, d
 	: device_t(mconfig, K053260, "K053260", tag, owner, clock),
 	  device_sound_interface(mconfig, *this)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(k053260_state));
+	m_token = global_alloc_clear(k053260_state);
 }
 
 //-------------------------------------------------

src/emu/sound/k056800.c

@@ -168,7 +168,7 @@ const device_type K056800 = &device_creator<k056800_device>;
 k056800_device::k056800_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
 	: device_t(mconfig, K056800, "Konami 056800 MIRAC", tag, owner, clock)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(k056800_state));
+	m_token = global_alloc_clear(k056800_state);
 }
 
 //-------------------------------------------------

src/emu/sound/msm5205.c

@@ -346,13 +346,13 @@ msm5205_device::msm5205_device(const machine_config &mconfig, const char *tag, d
 	: device_t(mconfig, MSM5205, "MSM5205", tag, owner, clock),
 	  device_sound_interface(mconfig, *this)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(msm5205_state));
+	m_token = global_alloc_clear(msm5205_state);
 }
 msm5205_device::msm5205_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock)
 	: device_t(mconfig, type, name, tag, owner, clock),
 	  device_sound_interface(mconfig, *this)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(msm5205_state));
+	m_token = global_alloc_clear(msm5205_state);
 }
 
 //-------------------------------------------------

src/emu/sound/msm5232.c

@@ -856,7 +856,7 @@ msm5232_device::msm5232_device(const machine_config &mconfig, const char *tag, d
 	: device_t(mconfig, MSM5232, "MSM5232", tag, owner, clock),
 	  device_sound_interface(mconfig, *this)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(msm5232_state));
+	m_token = global_alloc_clear(msm5232_state);
 }
 
 //-------------------------------------------------

src/emu/sound/multipcm.c

@@ -678,7 +678,7 @@ multipcm_device::multipcm_device(const machine_config &mconfig, const char *tag,
 	: device_t(mconfig, MULTIPCM, "Sega/Yamaha 315-5560", tag, owner, clock),
 	  device_sound_interface(mconfig, *this)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(MultiPCM));
+	m_token = global_alloc_clear(MultiPCM);
 }
 
 //-------------------------------------------------

src/emu/sound/n63701x.c

@@ -159,7 +159,7 @@ namco_63701x_device::namco_63701x_device(const machine_config &mconfig, const ch
 	: device_t(mconfig, NAMCO_63701X, "Namco 63701X", tag, owner, clock),
 	  device_sound_interface(mconfig, *this)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(namco_63701x));
+	m_token = global_alloc_clear(namco_63701x);
 }
 
 //-------------------------------------------------

src/emu/sound/namco.c

@@ -819,14 +819,14 @@ namco_device::namco_device(const machine_config &mconfig, const char *tag, devic
 	: device_t(mconfig, NAMCO, "Namco", tag, owner, clock),
 	  device_sound_interface(mconfig, *this)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(namco_sound));
+	m_token = global_alloc_clear(namco_sound);
 }
 
 namco_device::namco_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock)
 	: device_t(mconfig, type, name, tag, owner, clock),
 	  device_sound_interface(mconfig, *this)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(namco_sound));
+	m_token = global_alloc_clear(namco_sound);
 }
 
 //-------------------------------------------------

src/emu/sound/nes_apu.c

@@ -770,7 +770,7 @@ nesapu_device::nesapu_device(const machine_config &mconfig, const char *tag, dev
 	: device_t(mconfig, NES, "N2A03", tag, owner, clock),
 	  device_sound_interface(mconfig, *this)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(nesapu_state));
+	m_token = global_alloc_clear(nesapu_state);
 }
 
 //-------------------------------------------------

src/emu/sound/nile.c

@@ -235,7 +235,7 @@ nile_device::nile_device(const machine_config &mconfig, const char *tag, device_
 	: device_t(mconfig, NILE, "NiLe", tag, owner, clock),
 	  device_sound_interface(mconfig, *this)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(nile_state));
+	m_token = global_alloc_clear(nile_state);
 }
 
 //-------------------------------------------------

src/emu/sound/okim6258.c

@@ -358,7 +358,7 @@ okim6258_device::okim6258_device(const machine_config &mconfig, const char *tag,
 	: device_t(mconfig, OKIM6258, "OKI6258", tag, owner, clock),
 	  device_sound_interface(mconfig, *this)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(okim6258_state));
+	m_token = global_alloc_clear(okim6258_state);
 }
 
 //-------------------------------------------------

src/emu/sound/okim6376.c

@@ -624,7 +624,7 @@ okim6376_device::okim6376_device(const machine_config &mconfig, const char *tag,
 	: device_t(mconfig, OKIM6376, "OKI6376", tag, owner, clock),
 	  device_sound_interface(mconfig, *this)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(okim6376_state));
+	m_token = global_alloc_clear(okim6376_state);
 }
 
 //-------------------------------------------------

src/emu/sound/qsound.c

@@ -375,7 +375,7 @@ qsound_device::qsound_device(const machine_config &mconfig, const char *tag, dev
 	: device_t(mconfig, QSOUND, "Q-Sound", tag, owner, clock),
 	  device_sound_interface(mconfig, *this)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(qsound_state));
+	m_token = global_alloc_clear(qsound_state);
 }
 
 //-------------------------------------------------

src/emu/sound/rf5c400.c

@@ -562,7 +562,7 @@ rf5c400_device::rf5c400_device(const machine_config &mconfig, const char *tag, d
 	: device_t(mconfig, RF5C400, "RF5C400", tag, owner, clock),
 	  device_sound_interface(mconfig, *this)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(rf5c400_state));
+	m_token = global_alloc_clear(rf5c400_state);
 }
 
 //-------------------------------------------------

src/emu/sound/rf5c68.c

@@ -262,7 +262,7 @@ rf5c68_device::rf5c68_device(const machine_config &mconfig, const char *tag, dev
 	: device_t(mconfig, RF5C68, "RF5C68", tag, owner, clock),
 	  device_sound_interface(mconfig, *this)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(rf5c68_state));
+	m_token = global_alloc_clear(rf5c68_state);
 }
 
 //-------------------------------------------------

src/emu/sound/s14001a.c

@@ -635,7 +635,7 @@ s14001a_device::s14001a_device(const machine_config &mconfig, const char *tag, d
 	: device_t(mconfig, S14001A, "S14001A", tag, owner, clock),
 	  device_sound_interface(mconfig, *this)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(S14001AChip));
+	m_token = global_alloc_clear(S14001AChip);
 }
 
 //-------------------------------------------------

src/emu/sound/s2636.c

@@ -87,7 +87,7 @@ s2636_sound_device::s2636_sound_device(const machine_config &mconfig, const char
 	: device_t(mconfig, S2636_SOUND, "S2636", tag, owner, clock),
 	  device_sound_interface(mconfig, *this)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(s2636_sound));
+	m_token = global_alloc_clear(s2636_sound);
 }
 
 //-------------------------------------------------

src/emu/sound/saa1099.c

@@ -441,7 +441,7 @@ saa1099_device::saa1099_device(const machine_config &mconfig, const char *tag, d
 	: device_t(mconfig, SAA1099, "SAA1099", tag, owner, clock),
 	  device_sound_interface(mconfig, *this)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(saa1099_state));
+	m_token = global_alloc_clear(saa1099_state);
 }
 
 //-------------------------------------------------

src/emu/sound/scsp.c

@@ -1361,7 +1361,7 @@ scsp_device::scsp_device(const machine_config &mconfig, const char *tag, device_
 	: device_t(mconfig, SCSP, "SCSP", tag, owner, clock),
 	  device_sound_interface(mconfig, *this)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(scsp_state));
+	m_token = global_alloc_clear(scsp_state);
 }
 
 //-------------------------------------------------

src/emu/sound/segapcm.c

@@ -153,7 +153,7 @@ segapcm_device::segapcm_device(const machine_config &mconfig, const char *tag, d
 	: device_t(mconfig, SEGAPCM, "Sega PCM", tag, owner, clock),
 	  device_sound_interface(mconfig, *this)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(segapcm_state));
+	m_token = global_alloc_clear(segapcm_state);
 }
 
 //-------------------------------------------------

src/emu/sound/sn76477.c

@@ -2472,7 +2472,7 @@ sn76477_device::sn76477_device(const machine_config &mconfig, const char *tag, d
 	: device_t(mconfig, SN76477, "SN76477", tag, owner, clock),
 	  device_sound_interface(mconfig, *this)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(sn76477_state));
+	m_token = global_alloc_clear(sn76477_state);
 }
 
 //-------------------------------------------------

src/emu/sound/sn76496.c

@@ -491,13 +491,13 @@ sn76496_device::sn76496_device(const machine_config &mconfig, const char *tag, d
 	: device_t(mconfig, SN76496, "SN76496", tag, owner, clock),
 	  device_sound_interface(mconfig, *this)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(sn76496_state));
+	m_token = global_alloc_clear(sn76496_state);
 }
 sn76496_device::sn76496_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock)
 	: device_t(mconfig, type, name, tag, owner, clock),
 	  device_sound_interface(mconfig, *this)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(sn76496_state));
+	m_token = global_alloc_clear(sn76496_state);
 }
 
 //-------------------------------------------------

src/emu/sound/snkwave.c

@@ -164,7 +164,7 @@ snkwave_device::snkwave_device(const machine_config &mconfig, const char *tag, d
 	: device_t(mconfig, SNKWAVE, "SNK Wave", tag, owner, clock),
 	  device_sound_interface(mconfig, *this)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(snkwave_state));
+	m_token = global_alloc_clear(snkwave_state);
 }
 
 //-------------------------------------------------

src/emu/sound/sp0250.c

@@ -243,7 +243,7 @@ sp0250_device::sp0250_device(const machine_config &mconfig, const char *tag, dev
 	: device_t(mconfig, SP0250, "SP0250", tag, owner, clock),
 	  device_sound_interface(mconfig, *this)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(sp0250_state));
+	m_token = global_alloc_clear(sp0250_state);
 }
 
 //-------------------------------------------------

src/emu/sound/sp0256.c

@@ -1370,7 +1370,7 @@ sp0256_device::sp0256_device(const machine_config &mconfig, const char *tag, dev
 	: device_t(mconfig, SP0256, "SP0256", tag, owner, clock),
 	  device_sound_interface(mconfig, *this)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(sp0256_state));
+	m_token = global_alloc_clear(sp0256_state);
 }
 
 //-------------------------------------------------

src/emu/sound/speaker.c

@@ -423,7 +423,7 @@ speaker_sound_device::speaker_sound_device(const machine_config &mconfig, const
 	: device_t(mconfig, SPEAKER_SOUND, "Speaker", tag, owner, clock),
 	  device_sound_interface(mconfig, *this)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(speaker_state));
+	m_token = global_alloc_clear(speaker_state);
 }
 
 //-------------------------------------------------

src/emu/sound/st0016.c

@@ -150,7 +150,7 @@ st0016_device::st0016_device(const machine_config &mconfig, const char *tag, dev
 	: device_t(mconfig, ST0016, "ST0016", tag, owner, clock),
 	  device_sound_interface(mconfig, *this)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(st0016_state));
+	m_token = global_alloc_clear(st0016_state);
 }
 
 //-------------------------------------------------

src/emu/sound/t6w28.c

@@ -370,7 +370,7 @@ t6w28_device::t6w28_device(const machine_config &mconfig, const char *tag, devic
 	: device_t(mconfig, T6W28, "T6W28", tag, owner, clock),
 	  device_sound_interface(mconfig, *this)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(t6w28_state));
+	m_token = global_alloc_clear(t6w28_state);
 }
 
 //-------------------------------------------------

src/emu/sound/tiaintf.c

@@ -52,7 +52,7 @@ tia_device::tia_device(const machine_config &mconfig, const char *tag, device_t
 	: device_t(mconfig, TIA, "TIA", tag, owner, clock),
 	  device_sound_interface(mconfig, *this)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(tia_state));
+	m_token = global_alloc_clear(tia_state);
 }
 
 //-------------------------------------------------

src/emu/sound/tms3615.c

@@ -99,7 +99,7 @@ tms3615_device::tms3615_device(const machine_config &mconfig, const char *tag, d
 	: device_t(mconfig, TMS3615, "TMS3615", tag, owner, clock),
 	  device_sound_interface(mconfig, *this)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(tms_state));
+	m_token = global_alloc_clear(tms_state);
 }
 
 //-------------------------------------------------

src/emu/sound/tms36xx.c

@@ -529,7 +529,7 @@ tms36xx_device::tms36xx_device(const machine_config &mconfig, const char *tag, d
 	: device_t(mconfig, TMS36XX, "TMS36XX", tag, owner, clock),
 	  device_sound_interface(mconfig, *this)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(tms_state));
+	m_token = global_alloc_clear(tms_state);
 }
 
 //-------------------------------------------------

src/emu/sound/tms5110.c

@@ -1501,13 +1501,13 @@ tms5110_device::tms5110_device(const machine_config &mconfig, const char *tag, d
 	: device_t(mconfig, TMS5110, "TMS5110", tag, owner, clock),
 	  device_sound_interface(mconfig, *this)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(tms5110_state));
+	m_token = global_alloc_clear(tms5110_state);
 }
 tms5110_device::tms5110_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock)
 	: device_t(mconfig, type, name, tag, owner, clock),
 	  device_sound_interface(mconfig, *this)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(tms5110_state));
+	m_token = global_alloc_clear(tms5110_state);
 }
 
 //-------------------------------------------------
@@ -1717,7 +1717,7 @@ const device_type TMSPROM = &device_creator<tmsprom_device>;
 tmsprom_device::tmsprom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
 	: device_t(mconfig, TMSPROM, "TMSPROM", tag, owner, clock)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(tmsprom_state));
+	m_token = global_alloc_clear(tmsprom_state);
 }
 
 //-------------------------------------------------

src/emu/sound/tms5220.c

@@ -2036,13 +2036,13 @@ tms5220_device::tms5220_device(const machine_config &mconfig, const char *tag, d
 	: device_t(mconfig, TMS5220, "TMS5220", tag, owner, clock),
 	  device_sound_interface(mconfig, *this)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(tms5220_state));
+	m_token = global_alloc_clear(tms5220_state);
 }
 tms5220_device::tms5220_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock)
 	: device_t(mconfig, type, name, tag, owner, clock),
 	  device_sound_interface(mconfig, *this)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(tms5220_state));
+	m_token = global_alloc_clear(tms5220_state);
 }
 
 //-------------------------------------------------

src/emu/sound/upd7759.c

@@ -791,13 +791,13 @@ upd7759_device::upd7759_device(const machine_config &mconfig, const char *tag, d
 	: device_t(mconfig, UPD7759, "uPD7759", tag, owner, clock),
 	  device_sound_interface(mconfig, *this)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(upd7759_state));
+	m_token = global_alloc_clear(upd7759_state);
 }
 upd7759_device::upd7759_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock)
 	: device_t(mconfig, type, name, tag, owner, clock),
 	  device_sound_interface(mconfig, *this)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(upd7759_state));
+	m_token = global_alloc_clear(upd7759_state);
 }
 
 //-------------------------------------------------

src/emu/sound/vlm5030.c

@@ -693,7 +693,7 @@ vlm5030_device::vlm5030_device(const machine_config &mconfig, const char *tag, d
 	: device_t(mconfig, VLM5030, "VLM5030", tag, owner, clock),
 	  device_sound_interface(mconfig, *this)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(vlm5030_state));
+	m_token = global_alloc_clear(vlm5030_state);
 }
 
 //-------------------------------------------------

src/emu/sound/vrender0.c

@@ -244,7 +244,7 @@ vrender0_device::vrender0_device(const machine_config &mconfig, const char *tag,
 	: device_t(mconfig, VRENDER0, "VRender0", tag, owner, clock),
 	  device_sound_interface(mconfig, *this)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(vr0_state));
+	m_token = global_alloc_clear(vr0_state);
 }
 
 //-------------------------------------------------

src/emu/sound/x1_010.c

@@ -289,7 +289,7 @@ x1_010_device::x1_010_device(const machine_config &mconfig, const char *tag, dev
 	: device_t(mconfig, X1_010, "X1-010", tag, owner, clock),
 	  device_sound_interface(mconfig, *this)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(x1_010_state));
+	m_token = global_alloc_clear(x1_010_state);
 }
 
 //-------------------------------------------------

src/emu/sound/ymf271.c

@@ -1816,7 +1816,7 @@ ymf271_device::ymf271_device(const machine_config &mconfig, const char *tag, dev
 	: device_t(mconfig, YMF271, "YMF271", tag, owner, clock),
 	  device_sound_interface(mconfig, *this)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(YMF271Chip));
+	m_token = global_alloc_clear(YMF271Chip);
 }
 
 //-------------------------------------------------

src/emu/sound/ymf278b.c

@@ -1093,7 +1093,7 @@ ymf278b_device::ymf278b_device(const machine_config &mconfig, const char *tag, d
 	: device_t(mconfig, YMF278B, "YMF278B", tag, owner, clock),
 	  device_sound_interface(mconfig, *this)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(YMF278BChip));
+	m_token = global_alloc_clear(YMF278BChip);
 }
 
 //-------------------------------------------------

src/emu/sound/ymz280b.c

@@ -1051,7 +1051,7 @@ ymz280b_device::ymz280b_device(const machine_config &mconfig, const char *tag, d
 	: device_t(mconfig, YMZ280B, "YMZ280B", tag, owner, clock),
 	  device_sound_interface(mconfig, *this)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(ymz280b_state));
+	m_token = global_alloc_clear(ymz280b_state);
 }
 
 //-------------------------------------------------

src/emu/sound/zsg2.c

@@ -235,7 +235,7 @@ zsg2_device::zsg2_device(const machine_config &mconfig, const char *tag, device_
 	: device_t(mconfig, ZSG2, "ZSG-2", tag, owner, clock),
 	  device_sound_interface(mconfig, *this)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(zsg2_state));
+	m_token = global_alloc_clear(zsg2_state);
 }
 
 //-------------------------------------------------

src/emu/video/hd63484.c

@@ -1581,7 +1581,7 @@ const device_type HD63484 = &device_creator<hd63484_device>;
 hd63484_device::hd63484_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
 	: device_t(mconfig, HD63484, "HD63484", tag, owner, clock)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(hd63484_state));
+	m_token = global_alloc_clear(hd63484_state);
 }
 
 //-------------------------------------------------

src/emu/video/i8275.c

@@ -591,7 +591,7 @@ const device_type I8275 = &device_creator<i8275_device>;
 i8275_device::i8275_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
 	: device_t(mconfig, I8275, "Intel 8275", tag, owner, clock)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(i8275_t));
+	m_token = global_alloc_clear(i8275_t);
 }
 
 //-------------------------------------------------

src/emu/video/s2636.c

@@ -369,7 +369,7 @@ const device_type S2636 = &device_creator<s2636_device>;
 s2636_device::s2636_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
 	: device_t(mconfig, S2636, "Signetics 2636", tag, owner, clock)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(s2636_state));
+	m_token = global_alloc_clear(s2636_state);
 }
 
 //-------------------------------------------------

src/emu/video/tlc34076.c

@@ -285,7 +285,7 @@ const device_type TLC34076 = &device_creator<tlc34076_device>;
 tlc34076_device::tlc34076_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
 	: device_t(mconfig, TLC34076, "TLC34076", tag, owner, clock)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(tlc34076_state));
+	m_token = global_alloc_clear(tlc34076_state);
 }
 
 //-------------------------------------------------

src/emu/video/tms9927.c

@@ -311,12 +311,12 @@ const device_type TMS9927 = &device_creator<tms9927_device>;
 tms9927_device::tms9927_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
 	: device_t(mconfig, TMS9927, "TMS9927", tag, owner, clock)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(tms9927_state));
+	m_token = global_alloc_clear(tms9927_state);
 }
 tms9927_device::tms9927_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock)
 	: device_t(mconfig, type, name, tag, owner, clock)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(tms9927_state));
+	m_token = global_alloc_clear(tms9927_state);
 }
 
 //-------------------------------------------------

src/emu/video/voodoo.c

@@ -5658,7 +5658,7 @@ static void dump_rasterizer_stats(voodoo_state *v)
 voodoo_device::voodoo_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock)
 	: device_t(mconfig, type, name, tag, owner, clock)
 {
-	m_token = global_alloc_array_clear(UINT8, sizeof(voodoo_state));
+	m_token = global_alloc_clear(voodoo_state);
 }
 
 //-------------------------------------------------