Index: uspace/lib/drv/generic/remote_usbhc.c
===================================================================
--- uspace/lib/drv/generic/remote_usbhc.c	(revision 56e9fb08d7114e89f0168c642fc39ee8b60016af)
+++ uspace/lib/drv/generic/remote_usbhc.c	(revision 365e29e2bf360b7a6db5a954e90836d5f9a109d5)
@@ -238,9 +238,6 @@
 	}
 
-	usb_target_t target = {
-		{.address = DEV_IPC_GET_ARG1(*call),
-		.endpoint = DEV_IPC_GET_ARG2(*call) }
-	};
-	size_t data_buffer_len = DEV_IPC_GET_ARG3(*call);
+	const usb_target_t target = { .packed = DEV_IPC_GET_ARG1(*call) };
+	size_t data_buffer_len = DEV_IPC_GET_ARG2(*call);
 
 	int rc;
@@ -302,8 +299,5 @@
 	}
 
-	usb_target_t target = {{
-		.address = DEV_IPC_GET_ARG1(*call),
-		.endpoint = DEV_IPC_GET_ARG2(*call)
-	}};
+	const usb_target_t target = { .packed = DEV_IPC_GET_ARG1(*call) };
 
 	int rc;
@@ -379,6 +373,5 @@
 	type var = (type) DEV_IPC_GET_ARG##arg_no(*call) % (1 << 8)
 
-	_INIT_FROM_HIGH_DATA2(usb_address_t, address, 1);
-	_INIT_FROM_LOW_DATA2(usb_endpoint_t, endpoint, 1);
+	const usb_target_t target = { .packed = DEV_IPC_GET_ARG1(*call) };
 
 	_INIT_FROM_HIGH_DATA3(usb_speed_t, speed, 2);
@@ -395,5 +388,6 @@
 #undef _INIT_FROM_LOW_DATA3
 
-	int rc = usb_iface->register_endpoint(fun, address, speed, endpoint,
+	int rc = usb_iface->register_endpoint(fun, target.address,
+	    speed, target.endpoint,
 	    transfer_type, direction, max_packet_size, interval);
 
@@ -436,9 +430,5 @@
 	}
 
-	const usb_target_t target = {{
-		.address = DEV_IPC_GET_ARG1(*call),
-		.endpoint = DEV_IPC_GET_ARG2(*call)
-	}};
-
+	const usb_target_t target = { .packed = DEV_IPC_GET_ARG1(*call) };
 
 	async_transaction_t *trans = async_transaction_create(callid);
@@ -484,9 +474,5 @@
 	}
 
-	const usb_target_t target = {{
-		.address = DEV_IPC_GET_ARG1(*call),
-		.endpoint = DEV_IPC_GET_ARG2(*call)
-	}};
-
+	const usb_target_t target = { .packed = DEV_IPC_GET_ARG1(*call) };
 
 	async_transaction_t *trans = async_transaction_create(callid);