Index: uspace/app/wavplay/dplay.c
===================================================================
--- uspace/app/wavplay/dplay.c	(revision 8048931cc1749e5ca30afc675b7ed903dc310504)
+++ uspace/app/wavplay/dplay.c	(revision 59ff52ddecc1a8fae7d8227c3d89aba32776e065)
@@ -96,5 +96,5 @@
 static void device_event_callback(ipc_call_t *icall, void *arg)
 {
-	async_answer_5(icall, EOK, 0, 0, 0, 0, async_get_label());
+	async_accept_0(icall);
 	playback_t *pb = arg;
 	const size_t fragment_size = pb->buffer.size / DEFAULT_FRAGMENTS;
Index: uspace/app/wavplay/drec.c
===================================================================
--- uspace/app/wavplay/drec.c	(revision 8048931cc1749e5ca30afc675b7ed903dc310504)
+++ uspace/app/wavplay/drec.c	(revision 59ff52ddecc1a8fae7d8227c3d89aba32776e065)
@@ -94,5 +94,5 @@
 static void device_event_callback(ipc_call_t *icall, void *arg)
 {
-	async_answer_5(icall, EOK, 0, 0, 0, 0, async_get_label());
+	async_accept_0(icall);
 	record_t *rec = arg;
 	const size_t buffer_part = rec->buffer.size / BUFFER_PARTS;
Index: uspace/drv/bus/adb/cuda_adb/cuda_adb.c
===================================================================
--- uspace/drv/bus/adb/cuda_adb/cuda_adb.c	(revision 8048931cc1749e5ca30afc675b7ed903dc310504)
+++ uspace/drv/bus/adb/cuda_adb/cuda_adb.c	(revision 59ff52ddecc1a8fae7d8227c3d89aba32776e065)
@@ -204,5 +204,5 @@
 
 	/* Answer the IPC_M_CONNECT_ME_TO call. */
-	async_answer_5(icall, EOK, 0, 0, 0, 0, async_get_label());
+	async_accept_0(icall);
 
 	while (true) {
Index: uspace/drv/hid/adb-kbd/adb-kbd.c
===================================================================
--- uspace/drv/hid/adb-kbd/adb-kbd.c	(revision 8048931cc1749e5ca30afc675b7ed903dc310504)
+++ uspace/drv/hid/adb-kbd/adb-kbd.c	(revision 59ff52ddecc1a8fae7d8227c3d89aba32776e065)
@@ -199,5 +199,5 @@
 	 * Answer the first IPC_M_CONNECT_ME_TO call.
 	 */
-	async_answer_5(icall, EOK, 0, 0, 0, 0, async_get_label());
+	async_accept_0(icall);
 
 	kbd = (adb_kbd_t *)ddf_dev_data_get(ddf_fun_get_dev((ddf_fun_t *)arg));
Index: uspace/drv/hid/adb-mouse/adb-mouse.c
===================================================================
--- uspace/drv/hid/adb-mouse/adb-mouse.c	(revision 8048931cc1749e5ca30afc675b7ed903dc310504)
+++ uspace/drv/hid/adb-mouse/adb-mouse.c	(revision 59ff52ddecc1a8fae7d8227c3d89aba32776e065)
@@ -209,5 +209,5 @@
 	 * Answer the first IPC_M_CONNECT_ME_TO call.
 	 */
-	async_answer_5(icall, EOK, 0, 0, 0, 0, async_get_label());
+	async_accept_0(icall);
 
 	mouse = (adb_mouse_t *)ddf_dev_data_get(ddf_fun_get_dev((ddf_fun_t *)arg));
Index: uspace/drv/intctl/apic/apic.c
===================================================================
--- uspace/drv/intctl/apic/apic.c	(revision 8048931cc1749e5ca30afc675b7ed903dc310504)
+++ uspace/drv/intctl/apic/apic.c	(revision 59ff52ddecc1a8fae7d8227c3d89aba32776e065)
@@ -172,5 +172,5 @@
 	 * Answer the first IPC_M_CONNECT_ME_TO call.
 	 */
-	async_answer_5(icall, EOK, 0, 0, 0, 0, async_get_label());
+	async_accept_0(icall);
 
 	apic = (apic_t *) ddf_dev_data_get(ddf_fun_get_dev((ddf_fun_t *) arg));
Index: uspace/drv/intctl/i8259/i8259.c
===================================================================
--- uspace/drv/intctl/i8259/i8259.c	(revision 8048931cc1749e5ca30afc675b7ed903dc310504)
+++ uspace/drv/intctl/i8259/i8259.c	(revision 59ff52ddecc1a8fae7d8227c3d89aba32776e065)
@@ -101,5 +101,5 @@
 	 * Answer the first IPC_M_CONNECT_ME_TO call.
 	 */
-	async_answer_5(icall, EOK, 0, 0, 0, 0, async_get_label());
+	async_accept_0(icall);
 
 	i8259 = (i8259_t *) ddf_dev_data_get(ddf_fun_get_dev((ddf_fun_t *) arg));
Index: uspace/drv/intctl/icp-ic/icp-ic.c
===================================================================
--- uspace/drv/intctl/icp-ic/icp-ic.c	(revision 8048931cc1749e5ca30afc675b7ed903dc310504)
+++ uspace/drv/intctl/icp-ic/icp-ic.c	(revision 59ff52ddecc1a8fae7d8227c3d89aba32776e065)
@@ -77,5 +77,5 @@
 	 * Answer the first IPC_M_CONNECT_ME_TO call.
 	 */
-	async_answer_5(icall, EOK, 0, 0, 0, 0, async_get_label());
+	async_accept_0(icall);
 
 	icpic = (icpic_t *) ddf_dev_data_get(ddf_fun_get_dev((ddf_fun_t *) arg));
Index: uspace/drv/intctl/obio/obio.c
===================================================================
--- uspace/drv/intctl/obio/obio.c	(revision 8048931cc1749e5ca30afc675b7ed903dc310504)
+++ uspace/drv/intctl/obio/obio.c	(revision 59ff52ddecc1a8fae7d8227c3d89aba32776e065)
@@ -81,5 +81,5 @@
 	 * Answer the first IPC_M_CONNECT_ME_TO call.
 	 */
-	async_answer_5(icall, EOK, 0, 0, 0, 0, async_get_label());
+	async_accept_0(icall);
 
 	obio = (obio_t *) ddf_dev_data_get(ddf_fun_get_dev((ddf_fun_t *) arg));
Index: uspace/lib/c/generic/async/server.c
===================================================================
--- uspace/lib/c/generic/async/server.c	(revision 8048931cc1749e5ca30afc675b7ed903dc310504)
+++ uspace/lib/c/generic/async/server.c	(revision 59ff52ddecc1a8fae7d8227c3d89aba32776e065)
@@ -1023,4 +1023,10 @@
 }
 
+errno_t async_accept_0(ipc_call_t *call)
+{
+	return ipc_answer_5(call->cap_handle, EOK, 0, 0, 0, 0,
+	    async_get_label());
+}
+
 errno_t async_answer_0(ipc_call_t *call, errno_t retval)
 {
Index: uspace/lib/c/generic/bd_srv.c
===================================================================
--- uspace/lib/c/generic/bd_srv.c	(revision 8048931cc1749e5ca30afc675b7ed903dc310504)
+++ uspace/lib/c/generic/bd_srv.c	(revision 59ff52ddecc1a8fae7d8227c3d89aba32776e065)
@@ -228,5 +228,5 @@
 
 	/* Accept the connection */
-	async_answer_5(icall, EOK, 0, 0, 0, 0, async_get_label());
+	async_accept_0(icall);
 
 	srv = bd_srv_create(srvs);
Index: uspace/lib/c/generic/inet/tcp.c
===================================================================
--- uspace/lib/c/generic/inet/tcp.c	(revision 8048931cc1749e5ca30afc675b7ed903dc310504)
+++ uspace/lib/c/generic/inet/tcp.c	(revision 59ff52ddecc1a8fae7d8227c3d89aba32776e065)
@@ -817,5 +817,5 @@
 	tcp_t *tcp = (tcp_t *)arg;
 
-	async_answer_5(icall, EOK, 0, 0, 0, 0, async_get_label());
+	async_accept_0(icall);
 
 	while (true) {
Index: uspace/lib/c/generic/inet/udp.c
===================================================================
--- uspace/lib/c/generic/inet/udp.c	(revision 8048931cc1749e5ca30afc675b7ed903dc310504)
+++ uspace/lib/c/generic/inet/udp.c	(revision 59ff52ddecc1a8fae7d8227c3d89aba32776e065)
@@ -494,5 +494,5 @@
 	udp_t *udp = (udp_t *)arg;
 
-	async_answer_5(icall, EOK, 0, 0, 0, 0, async_get_label());
+	async_accept_0(icall);
 
 	while (true) {
Index: uspace/lib/c/generic/io/chardev_srv.c
===================================================================
--- uspace/lib/c/generic/io/chardev_srv.c	(revision 8048931cc1749e5ca30afc675b7ed903dc310504)
+++ uspace/lib/c/generic/io/chardev_srv.c	(revision 59ff52ddecc1a8fae7d8227c3d89aba32776e065)
@@ -136,5 +136,5 @@
 
 	/* Accept the connection */
-	async_answer_5(icall, EOK, 0, 0, 0, 0, async_get_label());
+	async_accept_0(icall);
 
 	srv = chardev_srv_create(srvs);
Index: uspace/lib/c/generic/io/con_srv.c
===================================================================
--- uspace/lib/c/generic/io/con_srv.c	(revision 8048931cc1749e5ca30afc675b7ed903dc310504)
+++ uspace/lib/c/generic/io/con_srv.c	(revision 59ff52ddecc1a8fae7d8227c3d89aba32776e065)
@@ -333,5 +333,5 @@
 
 	/* Accept the connection */
-	async_answer_5(icall, EOK, 0, 0, 0, 0, async_get_label());
+	async_accept_0(icall);
 
 	srv = con_srv_create(srvs);
Index: uspace/lib/c/generic/iplink_srv.c
===================================================================
--- uspace/lib/c/generic/iplink_srv.c	(revision 8048931cc1749e5ca30afc675b7ed903dc310504)
+++ uspace/lib/c/generic/iplink_srv.c	(revision 59ff52ddecc1a8fae7d8227c3d89aba32776e065)
@@ -238,5 +238,5 @@
 
 	/* Accept the connection */
-	async_answer_5(icall, EOK, 0, 0, 0, 0, async_get_label());
+	async_accept_0(icall);
 
 	async_sess_t *sess = async_callback_receive(EXCHANGE_SERIALIZE);
Index: uspace/lib/c/include/async.h
===================================================================
--- uspace/lib/c/include/async.h	(revision 8048931cc1749e5ca30afc675b7ed903dc310504)
+++ uspace/lib/c/include/async.h	(revision 59ff52ddecc1a8fae7d8227c3d89aba32776e065)
@@ -332,4 +332,5 @@
     sysarg_t *, sysarg_t *);
 
+extern errno_t async_accept_0(ipc_call_t *);
 extern sysarg_t async_get_label(void);
 
Index: uspace/lib/drv/generic/driver.c
===================================================================
--- uspace/lib/drv/generic/driver.c	(revision 8048931cc1749e5ca30afc675b7ed903dc310504)
+++ uspace/lib/drv/generic/driver.c	(revision 59ff52ddecc1a8fae7d8227c3d89aba32776e065)
@@ -339,5 +339,5 @@
 {
 	/* Accept connection */
-	async_answer_5(icall, EOK, 0, 0, 0, 0, async_get_label());
+	async_accept_0(icall);
 
 	while (true) {
@@ -419,9 +419,11 @@
 		ret = (*fun->ops->open)(fun);
 
-	async_answer_5(icall, ret, 0, 0, 0, 0, async_get_label());
 	if (ret != EOK) {
+		async_answer_0(icall, ret);
 		fun_del_ref(fun);
 		return;
 	}
+
+	async_accept_0(icall);
 
 	while (true) {
Index: uspace/lib/fs/libfs.c
===================================================================
--- uspace/lib/fs/libfs.c	(revision 8048931cc1749e5ca30afc675b7ed903dc310504)
+++ uspace/lib/fs/libfs.c	(revision 59ff52ddecc1a8fae7d8227c3d89aba32776e065)
@@ -283,5 +283,5 @@
 		 * created by IPC_M_CONNECT_TO_ME.
 		 */
-		async_answer_5(icall, EOK, 0, 0, 0, 0, async_get_label());
+		async_accept_0(icall);
 	}
 
Index: uspace/lib/graph/graph.c
===================================================================
--- uspace/lib/graph/graph.c	(revision 8048931cc1749e5ca30afc675b7ed903dc310504)
+++ uspace/lib/graph/graph.c	(revision 59ff52ddecc1a8fae7d8227c3d89aba32776e065)
@@ -501,5 +501,5 @@
 
 	/* Accept the connection. */
-	async_answer_5(icall, EOK, 0, 0, 0, 0, async_get_label());
+	async_accept_0(icall);
 
 	/* Establish callback session. */
@@ -569,5 +569,5 @@
 
 	/* Accept the connection. */
-	async_answer_5(icall, EOK, 0, 0, 0, 0, async_get_label());
+	async_accept_0(icall);
 
 	/* Enter command loop. */
Index: uspace/lib/hound/src/protocol.c
===================================================================
--- uspace/lib/hound/src/protocol.c	(revision 8048931cc1749e5ca30afc675b7ed903dc310504)
+++ uspace/lib/hound/src/protocol.c	(revision 59ff52ddecc1a8fae7d8227c3d89aba32776e065)
@@ -396,5 +396,5 @@
 	/* Accept connection if there is a valid iface*/
 	if (server_iface) {
-		async_answer_5(icall, EOK, 0, 0, 0, 0, async_get_label());
+		async_accept_0(icall);
 	} else {
 		async_answer_0(icall, ENOTSUP);
Index: uspace/lib/usbvirt/src/device.c
===================================================================
--- uspace/lib/usbvirt/src/device.c	(revision 8048931cc1749e5ca30afc675b7ed903dc310504)
+++ uspace/lib/usbvirt/src/device.c	(revision 59ff52ddecc1a8fae7d8227c3d89aba32776e065)
@@ -58,5 +58,5 @@
 	assert(DEV != NULL);
 
-	async_answer_5(icall, EOK, 0, 0, 0, 0, async_get_label());
+	async_accept_0(icall);
 
 	while (true) {
Index: uspace/srv/audio/hound/audio_device.c
===================================================================
--- uspace/srv/audio/hound/audio_device.c	(revision 8048931cc1749e5ca30afc675b7ed903dc310504)
+++ uspace/srv/audio/hound/audio_device.c	(revision 59ff52ddecc1a8fae7d8227c3d89aba32776e065)
@@ -269,5 +269,5 @@
 
 	/* Answer initial request */
-	async_answer_5(icall, EOK, 0, 0, 0, 0, async_get_label());
+	async_accept_0(icall);
 	audio_device_t *dev = arg;
 	assert(dev);
Index: uspace/srv/bd/vbd/vbd.c
===================================================================
--- uspace/srv/bd/vbd/vbd.c	(revision 8048931cc1749e5ca30afc675b7ed903dc310504)
+++ uspace/srv/bd/vbd/vbd.c	(revision 59ff52ddecc1a8fae7d8227c3d89aba32776e065)
@@ -365,5 +365,5 @@
 
 	/* Accept the connection */
-	async_answer_5(icall, EOK, 0, 0, 0, 0, async_get_label());
+	async_accept_0(icall);
 
 	while (true) {
Index: uspace/srv/clipboard/clipboard.c
===================================================================
--- uspace/srv/clipboard/clipboard.c	(revision 8048931cc1749e5ca30afc675b7ed903dc310504)
+++ uspace/srv/clipboard/clipboard.c	(revision 59ff52ddecc1a8fae7d8227c3d89aba32776e065)
@@ -155,5 +155,5 @@
 {
 	/* Accept connection */
-	async_answer_5(icall, EOK, 0, 0, 0, 0, async_get_label());
+	async_accept_0(icall);
 
 	while (true) {
Index: uspace/srv/devman/client_conn.c
===================================================================
--- uspace/srv/devman/client_conn.c	(revision 8048931cc1749e5ca30afc675b7ed903dc310504)
+++ uspace/srv/devman/client_conn.c	(revision 59ff52ddecc1a8fae7d8227c3d89aba32776e065)
@@ -748,5 +748,5 @@
 {
 	/* Accept connection. */
-	async_answer_5(icall, EOK, 0, 0, 0, 0, async_get_label());
+	async_accept_0(icall);
 
 	while (true) {
Index: uspace/srv/devman/drv_conn.c
===================================================================
--- uspace/srv/devman/drv_conn.c	(revision 8048931cc1749e5ca30afc675b7ed903dc310504)
+++ uspace/srv/devman/drv_conn.c	(revision 59ff52ddecc1a8fae7d8227c3d89aba32776e065)
@@ -588,5 +588,5 @@
 
 	/* Accept the connection. */
-	async_answer_5(icall, EOK, 0, 0, 0, 0, async_get_label());
+	async_accept_0(icall);
 
 	client = async_get_client_data();
Index: uspace/srv/hid/compositor/compositor.c
===================================================================
--- uspace/srv/hid/compositor/compositor.c	(revision 8048931cc1749e5ca30afc675b7ed903dc310504)
+++ uspace/srv/hid/compositor/compositor.c	(revision 59ff52ddecc1a8fae7d8227c3d89aba32776e065)
@@ -918,5 +918,5 @@
 	/* Allocate resources for new window and register it to the location service. */
 	if (service_id == winreg_id) {
-		async_answer_5(icall, EOK, 0, 0, 0, 0, async_get_label());
+		async_accept_0(icall);
 
 		async_get_call(&call);
@@ -996,5 +996,5 @@
 
 	if (win) {
-		async_answer_5(icall, EOK, 0, 0, 0, 0, async_get_label());
+		async_accept_0(icall);
 	} else {
 		async_answer_0(icall, EINVAL);
Index: uspace/srv/hid/input/input.c
===================================================================
--- uspace/srv/hid/input/input.c	(revision 8048931cc1749e5ca30afc675b7ed903dc310504)
+++ uspace/srv/hid/input/input.c	(revision 59ff52ddecc1a8fae7d8227c3d89aba32776e065)
@@ -328,5 +328,5 @@
 	}
 
-	async_answer_5(icall, EOK, 0, 0, 0, 0, async_get_label());
+	async_accept_0(icall);
 
 	while (true) {
Index: uspace/srv/hid/isdv4_tablet/main.c
===================================================================
--- uspace/srv/hid/isdv4_tablet/main.c	(revision 8048931cc1749e5ca30afc675b7ed903dc310504)
+++ uspace/srv/hid/isdv4_tablet/main.c	(revision 59ff52ddecc1a8fae7d8227c3d89aba32776e065)
@@ -65,5 +65,5 @@
 static void mouse_connection(ipc_call_t *icall, void *arg)
 {
-	async_answer_5(icall, EOK, 0, 0, 0, 0, async_get_label());
+	async_accept_0(icall);
 
 	async_sess_t *sess =
Index: uspace/srv/hid/output/output.c
===================================================================
--- uspace/srv/hid/output/output.c	(revision 8048931cc1749e5ca30afc675b7ed903dc310504)
+++ uspace/srv/hid/output/output.c	(revision 59ff52ddecc1a8fae7d8227c3d89aba32776e065)
@@ -398,5 +398,5 @@
 {
 	/* Accept the connection */
-	async_answer_5(icall, EOK, 0, 0, 0, 0, async_get_label());
+	async_accept_0(icall);
 
 	while (true) {
Index: uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.c
===================================================================
--- uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.c	(revision 8048931cc1749e5ca30afc675b7ed903dc310504)
+++ uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.c	(revision 59ff52ddecc1a8fae7d8227c3d89aba32776e065)
@@ -372,5 +372,5 @@
 static void s3c24xx_ts_connection(ipc_call_t *icall, void *arg)
 {
-	async_answer_5(icall, EOK, 0, 0, 0, 0, async_get_label());
+	async_accept_0(icall);
 
 	while (true) {
Index: uspace/srv/loader/main.c
===================================================================
--- uspace/srv/loader/main.c	(revision 8048931cc1749e5ca30afc675b7ed903dc310504)
+++ uspace/srv/loader/main.c	(revision 59ff52ddecc1a8fae7d8227c3d89aba32776e065)
@@ -374,5 +374,5 @@
 
 	/* Accept the connection */
-	async_answer_5(icall, EOK, 0, 0, 0, 0, async_get_label());
+	async_accept_0(icall);
 
 	/* Ignore parameters, the connection is already open */
Index: uspace/srv/locsrv/locsrv.c
===================================================================
--- uspace/srv/locsrv/locsrv.c	(revision 8048931cc1749e5ca30afc675b7ed903dc310504)
+++ uspace/srv/locsrv/locsrv.c	(revision 59ff52ddecc1a8fae7d8227c3d89aba32776e065)
@@ -1396,5 +1396,5 @@
 {
 	/* Accept connection */
-	async_answer_5(icall, EOK, 0, 0, 0, 0, async_get_label());
+	async_accept_0(icall);
 
 	/*
@@ -1463,5 +1463,5 @@
 {
 	/* Accept connection */
-	async_answer_5(icall, EOK, 0, 0, 0, 0, async_get_label());
+	async_accept_0(icall);
 
 	while (true) {
Index: uspace/srv/logger/ctl.c
===================================================================
--- uspace/srv/logger/ctl.c	(revision 8048931cc1749e5ca30afc675b7ed903dc310504)
+++ uspace/srv/logger/ctl.c	(revision 59ff52ddecc1a8fae7d8227c3d89aba32776e065)
@@ -68,5 +68,5 @@
 	int fd;
 
-	async_answer_5(icall, EOK, 0, 0, 0, 0, async_get_label());
+	async_accept_0(icall);
 	logger_log("control: new client.\n");
 
Index: uspace/srv/logger/writer.c
===================================================================
--- uspace/srv/logger/writer.c	(revision 8048931cc1749e5ca30afc675b7ed903dc310504)
+++ uspace/srv/logger/writer.c	(revision 59ff52ddecc1a8fae7d8227c3d89aba32776e065)
@@ -98,5 +98,5 @@
 
 	/* Acknowledge the connection. */
-	async_answer_5(icall, EOK, 0, 0, 0, 0, async_get_label());
+	async_accept_0(icall);
 
 	logger_log("writer: new client.\n");
Index: uspace/srv/net/dhcp/main.c
===================================================================
--- uspace/srv/net/dhcp/main.c	(revision 8048931cc1749e5ca30afc675b7ed903dc310504)
+++ uspace/srv/net/dhcp/main.c	(revision 59ff52ddecc1a8fae7d8227c3d89aba32776e065)
@@ -128,5 +128,5 @@
 
 	/* Accept the connection */
-	async_answer_5(icall, EOK, 0, 0, 0, 0, async_get_label());
+	async_accept_0(icall);
 
 	while (true) {
Index: uspace/srv/net/dnsrsrv/dnsrsrv.c
===================================================================
--- uspace/srv/net/dnsrsrv/dnsrsrv.c	(revision 8048931cc1749e5ca30afc675b7ed903dc310504)
+++ uspace/srv/net/dnsrsrv/dnsrsrv.c	(revision 59ff52ddecc1a8fae7d8227c3d89aba32776e065)
@@ -213,5 +213,5 @@
 
 	/* Accept the connection */
-	async_answer_5(icall, EOK, 0, 0, 0, 0, async_get_label());
+	async_accept_0(icall);
 
 	while (true) {
Index: uspace/srv/net/inetsrv/inetcfg.c
===================================================================
--- uspace/srv/net/inetsrv/inetcfg.c	(revision 8048931cc1749e5ca30afc675b7ed903dc310504)
+++ uspace/srv/net/inetsrv/inetcfg.c	(revision 59ff52ddecc1a8fae7d8227c3d89aba32776e065)
@@ -742,5 +742,5 @@
 
 	/* Accept the connection */
-	async_answer_5(icall, EOK, 0, 0, 0, 0, async_get_label());
+	async_accept_0(icall);
 
 	while (true) {
Index: uspace/srv/net/inetsrv/inetping.c
===================================================================
--- uspace/srv/net/inetsrv/inetping.c	(revision 8048931cc1749e5ca30afc675b7ed903dc310504)
+++ uspace/srv/net/inetsrv/inetping.c	(revision 59ff52ddecc1a8fae7d8227c3d89aba32776e065)
@@ -284,5 +284,5 @@
 
 	/* Accept the connection */
-	async_answer_5(icall, EOK, 0, 0, 0, 0, async_get_label());
+	async_accept_0(icall);
 
 	inetping_client_t client;
Index: uspace/srv/net/inetsrv/inetsrv.c
===================================================================
--- uspace/srv/net/inetsrv/inetsrv.c	(revision 8048931cc1749e5ca30afc675b7ed903dc310504)
+++ uspace/srv/net/inetsrv/inetsrv.c	(revision 59ff52ddecc1a8fae7d8227c3d89aba32776e065)
@@ -390,5 +390,5 @@
 
 	/* Accept the connection */
-	async_answer_5(icall, EOK, 0, 0, 0, 0, async_get_label());
+	async_accept_0(icall);
 
 	inet_client_init(&client);
Index: uspace/srv/net/tcp/service.c
===================================================================
--- uspace/srv/net/tcp/service.c	(revision 8048931cc1749e5ca30afc675b7ed903dc310504)
+++ uspace/srv/net/tcp/service.c	(revision 59ff52ddecc1a8fae7d8227c3d89aba32776e065)
@@ -1169,5 +1169,5 @@
 
 	/* Accept the connection */
-	async_answer_5(icall, EOK, 0, 0, 0, 0, async_get_label());
+	async_accept_0(icall);
 
 	log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_client_conn() - client=%p",
Index: uspace/srv/net/udp/service.c
===================================================================
--- uspace/srv/net/udp/service.c	(revision 8048931cc1749e5ca30afc675b7ed903dc310504)
+++ uspace/srv/net/udp/service.c	(revision 59ff52ddecc1a8fae7d8227c3d89aba32776e065)
@@ -667,5 +667,5 @@
 
 	/* Accept the connection */
-	async_answer_5(icall, EOK, 0, 0, 0, 0, async_get_label());
+	async_accept_0(icall);
 
 	log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_client_conn()");
Index: uspace/srv/ns/ns.c
===================================================================
--- uspace/srv/ns/ns.c	(revision 8048931cc1749e5ca30afc675b7ed903dc310504)
+++ uspace/srv/ns/ns.c	(revision 59ff52ddecc1a8fae7d8227c3d89aba32776e065)
@@ -70,5 +70,5 @@
 	}
 
-	async_answer_5(icall, EOK, 0, 0, 0, 0, async_get_label());
+	async_accept_0(icall);
 
 	while (true) {
Index: uspace/srv/taskmon/taskmon.c
===================================================================
--- uspace/srv/taskmon/taskmon.c	(revision 8048931cc1749e5ca30afc675b7ed903dc310504)
+++ uspace/srv/taskmon/taskmon.c	(revision 59ff52ddecc1a8fae7d8227c3d89aba32776e065)
@@ -108,5 +108,5 @@
 {
 	/* Accept the connection */
-	async_answer_5(icall, EOK, 0, 0, 0, 0, async_get_label());
+	async_accept_0(icall);
 
 	while (true) {
Index: uspace/srv/vfs/vfs.c
===================================================================
--- uspace/srv/vfs/vfs.c	(revision 8048931cc1749e5ca30afc675b7ed903dc310504)
+++ uspace/srv/vfs/vfs.c	(revision 59ff52ddecc1a8fae7d8227c3d89aba32776e065)
@@ -56,5 +56,5 @@
 static void vfs_pager(ipc_call_t *icall, void *arg)
 {
-	async_answer_5(icall, EOK, 0, 0, 0, 0, async_get_label());
+	async_accept_0(icall);
 
 	while (true) {
Index: uspace/srv/vfs/vfs_ipc.c
===================================================================
--- uspace/srv/vfs/vfs_ipc.c	(revision 8048931cc1749e5ca30afc675b7ed903dc310504)
+++ uspace/srv/vfs/vfs_ipc.c	(revision 59ff52ddecc1a8fae7d8227c3d89aba32776e065)
@@ -324,5 +324,5 @@
 	 * This call needs to be answered.
 	 */
-	async_answer_5(icall, EOK, 0, 0, 0, 0, async_get_label());
+	async_accept_0(icall);
 
 	while (cont) {
Index: uspace/srv/volsrv/volsrv.c
===================================================================
--- uspace/srv/volsrv/volsrv.c	(revision 8048931cc1749e5ca30afc675b7ed903dc310504)
+++ uspace/srv/volsrv/volsrv.c	(revision 59ff52ddecc1a8fae7d8227c3d89aba32776e065)
@@ -551,5 +551,5 @@
 
 	/* Accept the connection */
-	async_answer_5(icall, EOK, 0, 0, 0, 0, async_get_label());
+	async_accept_0(icall);
 
 	while (true) {