diff --git a/src/mess/drivers/bullet.c b/src/mess/drivers/bullet.c
index 056ba3a4914..2f2d2a90208 100644
--- a/src/mess/drivers/bullet.c
+++ b/src/mess/drivers/bullet.c
@@ -1190,7 +1190,7 @@ static MACHINE_CONFIG_START( bulletf, bulletf_state )
 	MCFG_SCSIBUS_ADD(SCSIBUS_TAG)
 	MCFG_SCSIDEV_ADD(SCSIBUS_TAG ":harddisk0", SCSIHD, SCSI_ID_0)
 	MCFG_SCSICB_ADD(SCSIBUS_TAG ":host")
-	MCFG_SCSICB_REQ_HANDLER(DEVWRITELINE("^", bulletf_state, req_w))
+	MCFG_SCSICB_REQ_HANDLER(DEVWRITELINE(DEVICE_SELF_OWNER, bulletf_state, req_w))
 
 	// software lists
 	MCFG_SOFTWARE_LIST_ADD("flop_list", "wmbullet")
diff --git a/src/mess/drivers/fmtowns.c b/src/mess/drivers/fmtowns.c
index 59416eff2b1..156a67389c3 100644
--- a/src/mess/drivers/fmtowns.c
+++ b/src/mess/drivers/fmtowns.c
@@ -2701,8 +2701,8 @@ static MACHINE_CONFIG_FRAGMENT( towns_base )
 	MCFG_SCSIDEV_ADD("scsi:harddisk3", SCSIHD, SCSI_ID_3)
 	MCFG_SCSIDEV_ADD("scsi:harddisk4", SCSIHD, SCSI_ID_4)
 	MCFG_FMSCSI_ADD("scsi:fm")
-	MCFG_FMSCSI_IRQ_HANDLER(DEVWRITELINE("^", towns_state, towns_scsi_irq))
-	MCFG_FMSCSI_DRQ_HANDLER(DEVWRITELINE("^", towns_state, towns_scsi_drq))
+	MCFG_FMSCSI_IRQ_HANDLER(DEVWRITELINE(DEVICE_SELF_OWNER, towns_state, towns_scsi_irq))
+	MCFG_FMSCSI_DRQ_HANDLER(DEVWRITELINE(DEVICE_SELF_OWNER, towns_state, towns_scsi_drq))
 
 	MCFG_UPD71071_ADD("dma_1",towns_dma_config)
 	MCFG_UPD71071_ADD("dma_2",towns_dma_config)
diff --git a/src/mess/drivers/rmnimbus.c b/src/mess/drivers/rmnimbus.c
index 42c456a61a1..084ce960c16 100644
--- a/src/mess/drivers/rmnimbus.c
+++ b/src/mess/drivers/rmnimbus.c
@@ -315,11 +315,11 @@ static MACHINE_CONFIG_START( nimbus, rmnimbus_state )
 	MCFG_SCSIDEV_ADD(SCSIBUS_TAG ":harddisk2", ACB4070, SCSI_ID_2)
 	MCFG_SCSIDEV_ADD(SCSIBUS_TAG ":harddisk3", S1410, SCSI_ID_3)
 	MCFG_SCSICB_ADD(SCSIBUS_TAG ":host")
-	MCFG_SCSICB_BSY_HANDLER(DEVWRITELINE("^", rmnimbus_state, nimbus_scsi_bsy_w))
-	MCFG_SCSICB_CD_HANDLER(DEVWRITELINE("^", rmnimbus_state, nimbus_scsi_cd_w))
-	MCFG_SCSICB_IO_HANDLER(DEVWRITELINE("^", rmnimbus_state, nimbus_scsi_io_w))
-	MCFG_SCSICB_MSG_HANDLER(DEVWRITELINE("^", rmnimbus_state, nimbus_scsi_msg_w))
-	MCFG_SCSICB_REQ_HANDLER(DEVWRITELINE("^", rmnimbus_state, nimbus_scsi_req_w))
+	MCFG_SCSICB_BSY_HANDLER(DEVWRITELINE(DEVICE_SELF_OWNER, rmnimbus_state, nimbus_scsi_bsy_w))
+	MCFG_SCSICB_CD_HANDLER(DEVWRITELINE(DEVICE_SELF_OWNER, rmnimbus_state, nimbus_scsi_cd_w))
+	MCFG_SCSICB_IO_HANDLER(DEVWRITELINE(DEVICE_SELF_OWNER, rmnimbus_state, nimbus_scsi_io_w))
+	MCFG_SCSICB_MSG_HANDLER(DEVWRITELINE(DEVICE_SELF_OWNER, rmnimbus_state, nimbus_scsi_msg_w))
+	MCFG_SCSICB_REQ_HANDLER(DEVWRITELINE(DEVICE_SELF_OWNER, rmnimbus_state, nimbus_scsi_req_w))
 
 	MCFG_RAM_ADD(RAM_TAG)
 	MCFG_RAM_DEFAULT_SIZE("1536K")
diff --git a/src/mess/drivers/v1050.c b/src/mess/drivers/v1050.c
index 3ebdffbac33..b597c86a8ba 100644
--- a/src/mess/drivers/v1050.c
+++ b/src/mess/drivers/v1050.c
@@ -1112,7 +1112,7 @@ static MACHINE_CONFIG_START( v1050, v1050_state )
 	MCFG_SCSIBUS_ADD(SASIBUS_TAG)
 	MCFG_SCSIDEV_ADD(SASIBUS_TAG ":harddisk0", S1410, SCSI_ID_0)
 	MCFG_SCSICB_ADD(SASIBUS_TAG ":host")
-	MCFG_SCSICB_IO_HANDLER(DEVWRITELINE("^", v1050_state, sasi_io_w))
+	MCFG_SCSICB_IO_HANDLER(DEVWRITELINE(DEVICE_SELF_OWNER, v1050_state, sasi_io_w))
 
 	MCFG_TIMER_DRIVER_ADD(TIMER_ACK_TAG, v1050_state, sasi_ack_tick)
 	MCFG_TIMER_DRIVER_ADD(TIMER_RST_TAG, v1050_state, sasi_rst_tick)
diff --git a/src/mess/machine/d9060.c b/src/mess/machine/d9060.c
index 454ae1c0879..68e4d5a0684 100644
--- a/src/mess/machine/d9060.c
+++ b/src/mess/machine/d9060.c
@@ -467,7 +467,7 @@ static MACHINE_CONFIG_FRAGMENT( d9060 )
 	MCFG_SCSIBUS_ADD(SASIBUS_TAG)
 	MCFG_SCSIDEV_ADD(SASIBUS_TAG ":harddisk0", D9060HD, SCSI_ID_0)
 	MCFG_SCSICB_ADD(SASIBUS_TAG ":host")
-	MCFG_SCSICB_REQ_HANDLER(DEVWRITELINE("^", base_d9060_device, req_w))
+	MCFG_SCSICB_REQ_HANDLER(DEVWRITELINE(DEVICE_SELF_OWNER, base_d9060_device, req_w))
 MACHINE_CONFIG_END
 
 
diff --git a/src/mess/machine/e01.c b/src/mess/machine/e01.c
index 4acd895e8b2..6cac1d49f73 100644
--- a/src/mess/machine/e01.c
+++ b/src/mess/machine/e01.c
@@ -336,8 +336,8 @@ static MACHINE_CONFIG_FRAGMENT( e01 )
 	MCFG_SCSIBUS_ADD(SCSIBUS_TAG)
 	MCFG_SCSIDEV_ADD(SCSIBUS_TAG ":harddisk0", SCSIHD, SCSI_ID_0)
 	MCFG_SCSICB_ADD(SCSIBUS_TAG ":host")
-	MCFG_SCSICB_BSY_HANDLER(DEVWRITELINE("^", e01_device, scsi_bsy_w))
-	MCFG_SCSICB_REQ_HANDLER(DEVWRITELINE("^", e01_device, scsi_req_w))
+	MCFG_SCSICB_BSY_HANDLER(DEVWRITELINE(DEVICE_SELF_OWNER, e01_device, scsi_bsy_w))
+	MCFG_SCSICB_REQ_HANDLER(DEVWRITELINE(DEVICE_SELF_OWNER, e01_device, scsi_req_w))
 
 	// internal ram
 	MCFG_RAM_ADD(RAM_TAG)
diff --git a/src/mess/machine/lux4105.c b/src/mess/machine/lux4105.c
index df598b98ba6..7e54fe65119 100644
--- a/src/mess/machine/lux4105.c
+++ b/src/mess/machine/lux4105.c
@@ -67,9 +67,9 @@ static MACHINE_CONFIG_FRAGMENT( luxor_4105 )
 	MCFG_SCSIBUS_ADD(SASIBUS_TAG)
 	MCFG_SCSIDEV_ADD(SASIBUS_TAG ":harddisk0", S1410, SCSI_ID_0)
 	MCFG_SCSICB_ADD(SASIBUS_TAG ":host")
-	MCFG_SCSICB_BSY_HANDLER(DEVWRITELINE("^", luxor_4105_device, sasi_bsy_w))
-	MCFG_SCSICB_IO_HANDLER(DEVWRITELINE("^", luxor_4105_device, sasi_io_w))
-	MCFG_SCSICB_REQ_HANDLER(DEVWRITELINE("^", luxor_4105_device, sasi_req_w))
+	MCFG_SCSICB_BSY_HANDLER(DEVWRITELINE(DEVICE_SELF_OWNER, luxor_4105_device, sasi_bsy_w))
+	MCFG_SCSICB_IO_HANDLER(DEVWRITELINE(DEVICE_SELF_OWNER, luxor_4105_device, sasi_io_w))
+	MCFG_SCSICB_REQ_HANDLER(DEVWRITELINE(DEVICE_SELF_OWNER, luxor_4105_device, sasi_req_w))
 MACHINE_CONFIG_END