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);