Index: uspace/drv/hid/atkbd/atkbd.c
===================================================================
--- uspace/drv/hid/atkbd/atkbd.c	(revision a35b458e9db1ca95e679799dc7c1b12c83359ca3)
+++ uspace/drv/hid/atkbd/atkbd.c	(revision 84239b1cd7c5ed286263ce4edb649da00b34b249)
@@ -302,17 +302,16 @@
 	const sysarg_t method = IPC_GET_IMETHOD(*icall);
 	at_kbd_t *kbd = ddf_dev_data_get(ddf_fun_get_dev(fun));
+	async_sess_t *sess;
 
 	switch (method) {
-	case KBDEV_SET_IND: {
+	case KBDEV_SET_IND:
 		async_answer_0(icallid, ENOTSUP);
 		break;
-	}
 	/*
 	 * This might be ugly but async_callback_receive_start makes no
 	 * difference for incorrect call and malloc failure.
 	 */
-	case IPC_M_CONNECT_TO_ME: {
-		async_sess_t *sess =
-		    async_callback_receive_start(EXCHANGE_SERIALIZE, icall);
+	case IPC_M_CONNECT_TO_ME:
+		sess = async_callback_receive_start(EXCHANGE_SERIALIZE, icall);
 
 		/* Probably ENOMEM error, try again. */
@@ -334,5 +333,4 @@
 
 		break;
-	}
 	default:
 		ddf_msg(LVL_ERROR, "Unknown method: %d.", (int)method);
Index: uspace/drv/hid/ps2mouse/ps2mouse.c
===================================================================
--- uspace/drv/hid/ps2mouse/ps2mouse.c	(revision a35b458e9db1ca95e679799dc7c1b12c83359ca3)
+++ uspace/drv/hid/ps2mouse/ps2mouse.c	(revision 84239b1cd7c5ed286263ce4edb649da00b34b249)
@@ -408,11 +408,11 @@
 	const sysarg_t method = IPC_GET_IMETHOD(*icall);
 	ps2_mouse_t *mouse = ddf_dev_data_get(ddf_fun_get_dev(fun));
+	async_sess_t *sess;
 
 	switch (method) {
 	/* This might be ugly but async_callback_receive_start makes no
 	 * difference for incorrect call and malloc failure. */
-	case IPC_M_CONNECT_TO_ME: {
-		async_sess_t *sess =
-		    async_callback_receive_start(EXCHANGE_SERIALIZE, icall);
+	case IPC_M_CONNECT_TO_ME:
+		sess = async_callback_receive_start(EXCHANGE_SERIALIZE, icall);
 		/* Probably ENOMEM error, try again. */
 		if (sess == NULL) {
@@ -431,5 +431,4 @@
 		}
 		break;
-	}
 	default:
 		ddf_msg(LVL_ERROR, "Unknown method: %d.", (int)method);
Index: uspace/drv/hid/usbhid/kbd/kbddev.c
===================================================================
--- uspace/drv/hid/usbhid/kbd/kbddev.c	(revision a35b458e9db1ca95e679799dc7c1b12c83359ca3)
+++ uspace/drv/hid/usbhid/kbd/kbddev.c	(revision 84239b1cd7c5ed286263ce4edb649da00b34b249)
@@ -165,4 +165,5 @@
 	const sysarg_t method = IPC_GET_IMETHOD(*icall);
 	usb_kbd_t *kbd_dev = ddf_fun_data_get(fun);
+	async_sess_t *sess;
 
 	switch (method) {
@@ -174,7 +175,6 @@
 	/* This might be ugly but async_callback_receive_start makes no
 	 * difference for incorrect call and malloc failure. */
-	case IPC_M_CONNECT_TO_ME: {
-		async_sess_t *sess =
-		    async_callback_receive_start(EXCHANGE_SERIALIZE, icall);
+	case IPC_M_CONNECT_TO_ME:
+		sess = async_callback_receive_start(EXCHANGE_SERIALIZE, icall);
 		/* Probably ENOMEM error, try again. */
 		if (sess == NULL) {
@@ -194,5 +194,4 @@
 		}
 		break;
-	}
 	default:
 			usb_log_error("%s: Unknown method: %d.",
Index: uspace/drv/hid/xtkbd/xtkbd.c
===================================================================
--- uspace/drv/hid/xtkbd/xtkbd.c	(revision a35b458e9db1ca95e679799dc7c1b12c83359ca3)
+++ uspace/drv/hid/xtkbd/xtkbd.c	(revision 84239b1cd7c5ed286263ce4edb649da00b34b249)
@@ -338,12 +338,14 @@
 	const sysarg_t method = IPC_GET_IMETHOD(*icall);
 	xt_kbd_t *kbd = ddf_dev_data_get(ddf_fun_get_dev(fun));
+	unsigned mods;
+	async_sess_t *sess;
 
 	switch (method) {
-	case KBDEV_SET_IND: {
+	case KBDEV_SET_IND:
 		/*
 		 * XT keyboards do not support setting mods,
 		 * assume AT keyboard with Scan Code Set 1.
 		 */
-		const unsigned mods = IPC_GET_ARG1(*icall);
+		mods = IPC_GET_ARG1(*icall);
 		const uint8_t status = 0 |
 		    ((mods & KM_CAPS_LOCK) ? LI_CAPS : 0) |
@@ -362,12 +364,10 @@
 		async_answer_0(icallid, rc);
 		break;
-	}
 	/*
 	 * This might be ugly but async_callback_receive_start makes no
 	 * difference for incorrect call and malloc failure.
 	 */
-	case IPC_M_CONNECT_TO_ME: {
-		async_sess_t *sess =
-		    async_callback_receive_start(EXCHANGE_SERIALIZE, icall);
+	case IPC_M_CONNECT_TO_ME:
+		sess = async_callback_receive_start(EXCHANGE_SERIALIZE, icall);
 
 		/* Probably ENOMEM error, try again. */
@@ -389,5 +389,4 @@
 
 		break;
-	}
 	default:
 		ddf_msg(LVL_ERROR, "Unknown method: %d.", (int)method);