Index: uspace/lib/ext4/src/balloc.c
===================================================================
--- uspace/lib/ext4/src/balloc.c	(revision a35b458e9db1ca95e679799dc7c1b12c83359ca3)
+++ uspace/lib/ext4/src/balloc.c	(revision bde48fa65c57367a67698ab35393a7092b988112)
@@ -352,4 +352,5 @@
 	uint32_t free_blocks;
 	uint32_t goal;
+	uint32_t block_size;
 
 	/* Find GOAL */
@@ -585,8 +586,5 @@
 
 success:
-	/* Empty command - because of syntax */
-	;
-
-	uint32_t block_size = ext4_superblock_get_block_size(sb);
+	block_size = ext4_superblock_get_block_size(sb);
 
 	/* Update superblock free blocks count */
Index: uspace/lib/ext4/src/extent.c
===================================================================
--- uspace/lib/ext4/src/extent.c	(revision a35b458e9db1ca95e679799dc7c1b12c83359ca3)
+++ uspace/lib/ext4/src/extent.c	(revision bde48fa65c57367a67698ab35393a7092b988112)
@@ -476,4 +476,5 @@
 	uint16_t pos = 0;
 	errno_t rc;
+	errno_t rc2;
 	while (ext4_extent_header_get_depth(eh) != 0) {
 		/* Search index in index node by iblock */
@@ -513,7 +514,5 @@
 
 cleanup:
-	;
-
-	errno_t rc2 = EOK;
+	rc2 = EOK;
 
 	/*
@@ -623,4 +622,5 @@
 	/* Find the first extent to modify */
 	ext4_extent_path_t *path;
+	errno_t rc2;
 	errno_t rc = ext4_extent_find_extent(inode_ref, iblock_from, &path);
 	if (rc != EOK)
@@ -734,7 +734,5 @@
 
 cleanup:
-	;
-
-	errno_t rc2 = EOK;
+	rc2 = EOK;
 
 	/*
@@ -982,4 +980,5 @@
 	/* Load the nearest leaf (with extent) */
 	ext4_extent_path_t *path;
+	errno_t rc2;
 	errno_t rc = ext4_extent_find_extent(inode_ref, new_block_idx, &path);
 	if (rc != EOK)
@@ -1086,7 +1085,5 @@
 
 finish:
-	;
-
-	errno_t rc2 = EOK;
+	rc2 = EOK;
 
 	/* Set return values */
Index: uspace/lib/ext4/src/ops.c
===================================================================
--- uspace/lib/ext4/src/ops.c	(revision a35b458e9db1ca95e679799dc7c1b12c83359ca3)
+++ uspace/lib/ext4/src/ops.c	(revision bde48fa65c57367a67698ab35393a7092b988112)
@@ -219,4 +219,5 @@
 	ext4_node_t *eparent = EXT4_NODE(pfn);
 	ext4_filesystem_t *fs = eparent->instance->filesystem;
+	errno_t rc2;
 
 	if (!ext4_inode_is_type(fs->superblock, eparent->inode_ref->inode,
@@ -244,8 +245,6 @@
 
 exit:
-	;
-
 	/* Destroy search result structure */
-	errno_t const rc2 = ext4_directory_destroy_result(&result);
+	rc2 = ext4_directory_destroy_result(&result);
 	return rc == EOK ? rc2 : rc;
 }
@@ -1279,4 +1278,5 @@
 {
 	fs_node_t *fn;
+	errno_t rc2;
 	errno_t rc = ext4_node_get(&fn, service_id, index);
 	if (rc != EOK)
@@ -1395,7 +1395,5 @@
 
 exit:
-	;
-
-	errno_t const rc2 = ext4_node_put(fn);
+	rc2 = ext4_node_put(fn);
 	return rc == EOK ? rc2 : rc;
 }