Index: uspace/drv/bus/usb/ohci/ohci_rh.c
===================================================================
--- uspace/drv/bus/usb/ohci/ohci_rh.c	(revision 5ef169038f3c0afb4938a7b77c8772fc6025b1b7)
+++ uspace/drv/bus/usb/ohci/ohci_rh.c	(revision 338d54a7c4a77bbe3bf0bdff3c750bad8bb1ea9a)
@@ -343,4 +343,5 @@
 	ohci_rh_t *hub;
 	unsigned port;
+	uint32_t rhda;
 	TEST_SIZE_INIT(0, port, hub);
 	const unsigned feature = uint16_usb2host(setup_packet->value);
@@ -349,21 +350,17 @@
 	{
 	case USB_HUB_FEATURE_PORT_POWER:          /*8*/
-		{
-			const uint32_t rhda =
-			    OHCI_RD(hub->registers->rh_desc_a);
-			/* No power switching */
-			if (rhda & RHDA_NPS_FLAG)
-				return ENOTSUP;
-			/* Ganged power switching, one port powers all */
-			if (!(rhda & RHDA_PSM_FLAG)) {
-				OHCI_WR(hub->registers->rh_status,
-				    RHS_CLEAR_GLOBAL_POWER);
-				return EOK;
-			}
-			OHCI_WR(hub->registers->rh_port_status[port],
-			    RHPS_CLEAR_PORT_POWER);
+		rhda = OHCI_RD(hub->registers->rh_desc_a);
+		/* No power switching */
+		if (rhda & RHDA_NPS_FLAG)
+			return ENOTSUP;
+		/* Ganged power switching, one port powers all */
+		if (!(rhda & RHDA_PSM_FLAG)) {
+			OHCI_WR(hub->registers->rh_status,
+			    RHS_CLEAR_GLOBAL_POWER);
 			return EOK;
 		}
-
+		OHCI_WR(hub->registers->rh_port_status[port],
+		    RHPS_CLEAR_PORT_POWER);
+		return EOK;
 	case USB2_HUB_FEATURE_PORT_ENABLE:         /*1*/
 		OHCI_WR(hub->registers->rh_port_status[port],
@@ -407,4 +404,5 @@
 	ohci_rh_t *hub;
 	unsigned port;
+	uint32_t rhda;
 	TEST_SIZE_INIT(0, port, hub);
 	const unsigned feature = uint16_usb2host(setup_packet->value);
@@ -412,16 +410,14 @@
 	switch (feature) {
 	case USB_HUB_FEATURE_PORT_POWER:   /*8*/
-		{
-			const uint32_t rhda = OHCI_RD(hub->registers->rh_desc_a);
-
-			/* No power switching */
-			if (rhda & RHDA_NPS_FLAG)
-				return EOK;
-
-			/* Ganged power switching, one port powers all */
-			if (!(rhda & RHDA_PSM_FLAG)) {
-				OHCI_WR(hub->registers->rh_status,RHS_SET_GLOBAL_POWER);
-				return EOK;
-			}
+		rhda = OHCI_RD(hub->registers->rh_desc_a);
+
+		/* No power switching */
+		if (rhda & RHDA_NPS_FLAG)
+			return EOK;
+
+		/* Ganged power switching, one port powers all */
+		if (!(rhda & RHDA_PSM_FLAG)) {
+			OHCI_WR(hub->registers->rh_status,RHS_SET_GLOBAL_POWER);
+			return EOK;
 		}
 		/* Fall through, for per port power */
Index: uspace/drv/bus/usb/xhci/isoch.c
===================================================================
--- uspace/drv/bus/usb/xhci/isoch.c	(revision 5ef169038f3c0afb4938a7b77c8772fc6025b1b7)
+++ uspace/drv/bus/usb/xhci/isoch.c	(revision 338d54a7c4a77bbe3bf0bdff3c750bad8bb1ea9a)
@@ -310,4 +310,5 @@
 	while (isoch->transfers[isoch->hw_enqueue].state == ISOCH_FILLED) {
 		xhci_isoch_transfer_t * const it = &isoch->transfers[isoch->hw_enqueue];
+		suseconds_t delay;
 
 		assert(it->state == ISOCH_FILLED);
@@ -317,6 +318,6 @@
 
 		switch (wd.position) {
-		case WINDOW_TOO_SOON: {
-			const suseconds_t delay = wd.offset * 125;
+		case WINDOW_TOO_SOON:
+			delay = wd.offset * 125;
 			usb_log_debug("[isoch] delaying feeding buffer %zu for %ldus",
 				it - isoch->transfers, delay);
@@ -324,5 +325,4 @@
 			    isoch_feed_out_timer, ep);
 			goto out;
-		}
 
 		case WINDOW_INSIDE:
@@ -396,4 +396,5 @@
 	while (isoch->transfers[isoch->enqueue].state <= ISOCH_FILLED) {
 		xhci_isoch_transfer_t * const it = &isoch->transfers[isoch->enqueue];
+		suseconds_t delay;
 
 		/* IN buffers are "filled" with free space */
@@ -408,7 +409,7 @@
 
 		switch (wd.position) {
-		case WINDOW_TOO_SOON: {
+		case WINDOW_TOO_SOON:
 			/* Not allowed to feed yet. Defer to later. */
-			const suseconds_t delay = wd.offset * 125;
+			delay = wd.offset * 125;
 			usb_log_debug("[isoch] delaying feeding buffer %zu for %ldus",
 			    it - isoch->transfers, delay);
@@ -416,6 +417,4 @@
 			    isoch_feed_in_timer, ep);
 			goto out;
-		}
-
 		case WINDOW_TOO_LATE:
 			usb_log_debug("[isoch] missed feeding buffer %zu at 0x%llx by"
Index: uspace/drv/hid/atkbd/atkbd.c
===================================================================
--- uspace/drv/hid/atkbd/atkbd.c	(revision 5ef169038f3c0afb4938a7b77c8772fc6025b1b7)
+++ uspace/drv/hid/atkbd/atkbd.c	(revision 338d54a7c4a77bbe3bf0bdff3c750bad8bb1ea9a)
@@ -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 5ef169038f3c0afb4938a7b77c8772fc6025b1b7)
+++ uspace/drv/hid/ps2mouse/ps2mouse.c	(revision 338d54a7c4a77bbe3bf0bdff3c750bad8bb1ea9a)
@@ -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 5ef169038f3c0afb4938a7b77c8772fc6025b1b7)
+++ uspace/drv/hid/usbhid/kbd/kbddev.c	(revision 338d54a7c4a77bbe3bf0bdff3c750bad8bb1ea9a)
@@ -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 5ef169038f3c0afb4938a7b77c8772fc6025b1b7)
+++ uspace/drv/hid/xtkbd/xtkbd.c	(revision 338d54a7c4a77bbe3bf0bdff3c750bad8bb1ea9a)
@@ -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);