diff --git a/src/emu/bus/a2bus/a2hsscsi.c b/src/emu/bus/a2bus/a2hsscsi.c
index e42fef2da05..3efa4d75f4e 100644
--- a/src/emu/bus/a2bus/a2hsscsi.c
+++ b/src/emu/bus/a2bus/a2hsscsi.c
@@ -57,7 +57,6 @@ const device_type A2BUS_HSSCSI = &device_creator<a2bus_hsscsi_device>;
 #define SCSI_5380_TAG    "scsibus:7:ncr5380"
 
 static MACHINE_CONFIG_FRAGMENT( ncr5380 )
-	MCFG_DEVICE_MODIFY(DEVICE_SELF)
 	MCFG_DEVICE_CLOCK(10000000)
 	MCFG_NCR5380N_DRQ_HANDLER(DEVWRITELINE("^^", a2bus_hsscsi_device, drq_w))
 MACHINE_CONFIG_END
diff --git a/src/emu/bus/a2bus/a2scsi.c b/src/emu/bus/a2bus/a2scsi.c
index 81a88bf1fd4..178e3053f61 100644
--- a/src/emu/bus/a2bus/a2scsi.c
+++ b/src/emu/bus/a2bus/a2scsi.c
@@ -50,7 +50,6 @@ const device_type A2BUS_SCSI = &device_creator<a2bus_scsi_device>;
 #define SCSI_5380_TAG    "scsibus:7:ncr5380"
 
 static MACHINE_CONFIG_FRAGMENT( ncr5380 )
-	MCFG_DEVICE_MODIFY(DEVICE_SELF)
 	MCFG_DEVICE_CLOCK(10000000)
 	MCFG_NCR5380N_DRQ_HANDLER(DEVWRITELINE("^^", a2bus_scsi_device, drq_w))
 MACHINE_CONFIG_END
diff --git a/src/emu/mconfig.c b/src/emu/mconfig.c
index faa17e7f3a3..0ba56bb27d8 100644
--- a/src/emu/mconfig.c
+++ b/src/emu/mconfig.c
@@ -64,7 +64,7 @@ machine_config::machine_config(const game_driver &gamedrv, emu_options &options)
 
 				machine_config_constructor additions = option->machine_config();
 				if (additions != NULL)
-					(*additions)(const_cast<machine_config &>(*this), new_dev, NULL);
+					(*additions)(const_cast<machine_config &>(*this), new_dev, new_dev);
 
 				const input_device_default *input_device_defaults = option->input_device_defaults();
 				if (input_device_defaults)
diff --git a/src/mame/drivers/rastersp.c b/src/mame/drivers/rastersp.c
index 1b511fb5bad..07cf737bf49 100644
--- a/src/mame/drivers/rastersp.c
+++ b/src/mame/drivers/rastersp.c
@@ -845,7 +845,6 @@ WRITE32_MEMBER(rastersp_state::ncr53c700_write)
 }
 
 static MACHINE_CONFIG_FRAGMENT( ncr53c700 )
-	MCFG_DEVICE_MODIFY(DEVICE_SELF)
 	MCFG_DEVICE_CLOCK(66000000)
 	MCFG_NCR53C7XX_IRQ_HANDLER(DEVWRITELINE(":", rastersp_state, scsi_irq))
 	MCFG_NCR53C7XX_HOST_READ(DEVREAD32(":", rastersp_state, ncr53c700_read))
diff --git a/src/mess/drivers/next.c b/src/mess/drivers/next.c
index ae984a8950c..c1188f2ce90 100644
--- a/src/mess/drivers/next.c
+++ b/src/mess/drivers/next.c
@@ -948,7 +948,6 @@ static SLOT_INTERFACE_START( next_scsi_devices )
 SLOT_INTERFACE_END
 
 static MACHINE_CONFIG_FRAGMENT( ncr5390 )
-	MCFG_DEVICE_MODIFY(DEVICE_SELF)
 	MCFG_DEVICE_CLOCK(10000000)
 	MCFG_NCR5390_IRQ_HANDLER(DEVWRITELINE(":", next_state, scsi_irq))
 	MCFG_NCR5390_DRQ_HANDLER(DEVWRITELINE(":", next_state, scsi_drq))