Index: uspace/app/top/screen.c
===================================================================
--- uspace/app/top/screen.c	(revision 5ef169038f3c0afb4938a7b77c8772fc6025b1b7)
+++ uspace/app/top/screen.c	(revision 338d54a7c4a77bbe3bf0bdff3c750bad8bb1ea9a)
@@ -390,4 +390,7 @@
 		int width = table->columns[column_index].width;
 		field_t *field = &table->fields[i];
+		uint64_t val;
+		const char *psuffix;
+		char suffix;
 
 		if (column_index != 0) {
@@ -407,20 +410,16 @@
 			printf("%*" PRIu64, width, field->uint);
 			break;
-		case FIELD_UINT_SUFFIX_BIN: {
-			uint64_t val = field->uint;
-			const char *suffix;
+		case FIELD_UINT_SUFFIX_BIN:
+			val = field->uint;
 			width -= 3;
-			bin_order_suffix(val, &val, &suffix, true);
-			printf("%*" PRIu64 "%s", width, val, suffix);
-			break;
-		}
-		case FIELD_UINT_SUFFIX_DEC: {
-			uint64_t val = field->uint;
-			char suffix;
+			bin_order_suffix(val, &val, &psuffix, true);
+			printf("%*" PRIu64 "%s", width, val, psuffix);
+			break;
+		case FIELD_UINT_SUFFIX_DEC:
+			val = field->uint;
 			width -= 1;
 			order_suffix(val, &val, &suffix);
 			printf("%*" PRIu64 "%c", width, val, suffix);
 			break;
-		}
 		case FIELD_PERCENT:
 			width -= 5; /* nnn.% */
Index: uspace/dist/src/c/demos/top/screen.c
===================================================================
--- uspace/dist/src/c/demos/top/screen.c	(revision 5ef169038f3c0afb4938a7b77c8772fc6025b1b7)
+++ uspace/dist/src/c/demos/top/screen.c	(revision 338d54a7c4a77bbe3bf0bdff3c750bad8bb1ea9a)
@@ -45,4 +45,5 @@
 #include <inttypes.h>
 #include <macros.h>
+#include <str.h>
 #include "screen.h"
 #include "top.h"
@@ -389,4 +390,7 @@
 		int width = table->columns[column_index].width;
 		field_t *field = &table->fields[i];
+		uint64_t val;
+		const char *psuffix;
+		char suffix;
 
 		if (column_index != 0) {
@@ -406,20 +410,16 @@
 			printf("%*" PRIu64, width, field->uint);
 			break;
-		case FIELD_UINT_SUFFIX_BIN: {
-			uint64_t val = field->uint;
-			const char *suffix;
+		case FIELD_UINT_SUFFIX_BIN:
+			val = field->uint;
 			width -= 3;
-			bin_order_suffix(val, &val, &suffix, true);
-			printf("%*" PRIu64 "%s", width, val, suffix);
-			break;
-		}
-		case FIELD_UINT_SUFFIX_DEC: {
-			uint64_t val = field->uint;
-			char suffix;
+			bin_order_suffix(val, &val, &psuffix, true);
+			printf("%*" PRIu64 "%s", width, val, psuffix);
+			break;
+		case FIELD_UINT_SUFFIX_DEC:
+			val = field->uint;
 			width -= 1;
 			order_suffix(val, &val, &suffix);
 			printf("%*" PRIu64 "%c", width, val, suffix);
 			break;
-		}
 		case FIELD_PERCENT:
 			width -= 5; /* nnn.% */
@@ -537,5 +537,5 @@
  *
  */
-errno_t tgetchar(unsigned int sec)
+int tgetchar(unsigned int sec)
 {
 	/*
Index: uspace/dist/src/c/demos/top/screen.h
===================================================================
--- uspace/dist/src/c/demos/top/screen.h	(revision 5ef169038f3c0afb4938a7b77c8772fc6025b1b7)
+++ uspace/dist/src/c/demos/top/screen.h	(revision 338d54a7c4a77bbe3bf0bdff3c750bad8bb1ea9a)
@@ -47,5 +47,5 @@
     _HELENOS_PRINTF_ATTRIBUTE(1, 2);
 
-extern errno_t tgetchar(unsigned int);
+extern int tgetchar(unsigned int);
 
 #endif
Index: uspace/dist/src/c/demos/top/top.c
===================================================================
--- uspace/dist/src/c/demos/top/top.c	(revision 5ef169038f3c0afb4938a7b77c8772fc6025b1b7)
+++ uspace/dist/src/c/demos/top/top.c	(revision 338d54a7c4a77bbe3bf0bdff3c750bad8bb1ea9a)
@@ -43,4 +43,5 @@
 #include <errno.h>
 #include <gsort.h>
+#include <str.h>
 #include "screen.h"
 #include "top.h"
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);
Index: uspace/srv/audio/hound/audio_device.c
===================================================================
--- uspace/srv/audio/hound/audio_device.c	(revision 5ef169038f3c0afb4938a7b77c8772fc6025b1b7)
+++ uspace/srv/audio/hound/audio_device.c	(revision 338d54a7c4a77bbe3bf0bdff3c750bad8bb1ea9a)
@@ -263,4 +263,7 @@
 static void device_event_callback(ipc_callid_t iid, ipc_call_t *icall, void *arg)
 {
+	struct timeval time1;
+	errno_t ret;
+
 	/* Answer initial request */
 	async_answer_0(iid, EOK);
@@ -272,6 +275,5 @@
 		async_answer_0(callid, EOK);
 		switch(IPC_GET_IMETHOD(call)) {
-		case PCM_EVENT_FRAMES_PLAYED: {
-			struct timeval time1;
+		case PCM_EVENT_FRAMES_PLAYED:
 			getuptime(&time1);
 			//TODO add underrun detection.
@@ -285,9 +287,8 @@
 			    tv_sub_diff(&time2, &time1));
 			break;
-		}
-		case PCM_EVENT_CAPTURE_TERMINATED: {
+		case PCM_EVENT_CAPTURE_TERMINATED:
 			log_verbose("Capture terminated");
 			dev->source.format = AUDIO_FORMAT_ANY;
-			const errno_t ret = release_buffer(dev);
+			ret = release_buffer(dev);
 			if (ret != EOK) {
 				log_error("Failed to release buffer: %s",
@@ -296,9 +297,8 @@
 			audio_pcm_unregister_event_callback(dev->sess);
 			break;
-		}
-		case PCM_EVENT_PLAYBACK_TERMINATED: {
+		case PCM_EVENT_PLAYBACK_TERMINATED:
 			log_verbose("Playback Terminated");
 			dev->sink.format = AUDIO_FORMAT_ANY;
-			const errno_t ret = release_buffer(dev);
+			ret = release_buffer(dev);
 			if (ret != EOK) {
 				log_error("Failed to release buffer: %s",
@@ -307,7 +307,6 @@
 			audio_pcm_unregister_event_callback(dev->sess);
 			break;
-		}
-		case PCM_EVENT_FRAMES_CAPTURED: {
-			const errno_t ret = audio_source_push_data(&dev->source,
+		case PCM_EVENT_FRAMES_CAPTURED:
+			ret = audio_source_push_data(&dev->source,
 			    dev->buffer.position, dev->buffer.fragment_size);
 			advance_buffer(dev, dev->buffer.fragment_size);
@@ -315,10 +314,8 @@
 				log_warning("Failed to push recorded data");
 			break;
-		}
 		case 0:
 			log_info("Device event callback hangup");
 			return;
 		}
-
 	}
 }
Index: uspace/srv/logger/ctl.c
===================================================================
--- uspace/srv/logger/ctl.c	(revision 5ef169038f3c0afb4938a7b77c8772fc6025b1b7)
+++ uspace/srv/logger/ctl.c	(revision 338d54a7c4a77bbe3bf0bdff3c750bad8bb1ea9a)
@@ -65,4 +65,7 @@
 void logger_connection_handler_control(ipc_callid_t callid)
 {
+	errno_t rc;
+	int fd;
+
 	async_answer_0(callid, EOK);
 	logger_log("control: new client.\n");
@@ -76,17 +79,14 @@
 
 		switch (IPC_GET_IMETHOD(call)) {
-		case LOGGER_CONTROL_SET_DEFAULT_LEVEL: {
-			errno_t rc = set_default_logging_level(IPC_GET_ARG1(call));
+		case LOGGER_CONTROL_SET_DEFAULT_LEVEL:
+			rc = set_default_logging_level(IPC_GET_ARG1(call));
 			async_answer_0(callid, rc);
 			break;
-		}
-		case LOGGER_CONTROL_SET_LOG_LEVEL: {
-			errno_t rc = handle_log_level_change(IPC_GET_ARG1(call));
+		case LOGGER_CONTROL_SET_LOG_LEVEL:
+			rc = handle_log_level_change(IPC_GET_ARG1(call));
 			async_answer_0(callid, rc);
 			break;
-		}
-		case LOGGER_CONTROL_SET_ROOT: {
-			int fd;
-			errno_t rc = vfs_receive_handle(true, &fd);
+		case LOGGER_CONTROL_SET_ROOT:
+			rc = vfs_receive_handle(true, &fd);
 			if (rc == EOK) {
 				rc = vfs_root_set(fd);
@@ -95,5 +95,4 @@
 			async_answer_0(callid, rc);
 			break;
-		}
 		default:
 			async_answer_0(callid, EINVAL);
Index: uspace/srv/logger/writer.c
===================================================================
--- uspace/srv/logger/writer.c	(revision 5ef169038f3c0afb4938a7b77c8772fc6025b1b7)
+++ uspace/srv/logger/writer.c	(revision 338d54a7c4a77bbe3bf0bdff3c750bad8bb1ea9a)
@@ -96,4 +96,7 @@
 void logger_connection_handler_writer(ipc_callid_t callid)
 {
+	logger_log_t *log;
+	errno_t rc;
+
 	/* Acknowledge the connection. */
 	async_answer_0(callid, EOK);
@@ -112,6 +115,6 @@
 
 		switch (IPC_GET_IMETHOD(call)) {
-		case LOGGER_WRITER_CREATE_LOG: {
-			logger_log_t *log = handle_create_log(IPC_GET_ARG1(call));
+		case LOGGER_WRITER_CREATE_LOG:
+			log = handle_create_log(IPC_GET_ARG1(call));
 			if (log == NULL) {
 				async_answer_0(callid, ENOMEM);
@@ -126,11 +129,9 @@
 			async_answer_1(callid, EOK, (sysarg_t) log);
 			break;
-		}
-		case LOGGER_WRITER_MESSAGE: {
-			errno_t rc = handle_receive_message(IPC_GET_ARG1(call),
+		case LOGGER_WRITER_MESSAGE:
+			rc = handle_receive_message(IPC_GET_ARG1(call),
 			    IPC_GET_ARG2(call));
 			async_answer_0(callid, rc);
 			break;
-		}
 		default:
 			async_answer_0(callid, EINVAL);