diff --git a/src/internal/argv/argv.h b/src/internal/argv/argv.h
index 418e97b..c64a7b5 100644
--- a/src/internal/argv/argv.h
+++ b/src/internal/argv/argv.h
@@ -750,7 +750,8 @@ static struct argv_meta * argv_alloc(char ** argv, struct argv_ctx * ctx)
 
 		if (!(imeta->argv = calloc(argc+1,sizeof(char *))))
 			return argv_free_impl(imeta);
-		else if (!(imeta->strbuf = calloc(1,size+1)))
+
+		if (!(imeta->strbuf = calloc(1,size+1)))
 			return argv_free_impl(imeta);
 
 		for (i=0,dst=imeta->strbuf; i<argc; i++) {
@@ -760,15 +761,18 @@ static struct argv_meta * argv_alloc(char ** argv, struct argv_ctx * ctx)
 		}
 
 		imeta->meta.argv = imeta->argv;
-	} else
+	} else {
 		imeta->meta.argv = argv;
+	}
 
-	if (!(imeta->meta.entries = calloc(
-				ctx->nentries+1,
-				sizeof(struct argv_entry))))
+	imeta->meta.entries = calloc(
+		ctx->nentries+1,
+		sizeof(struct argv_entry));
+
+	if (!imeta->meta.entries)
 		return argv_free_impl(imeta);
-	else
-		return &imeta->meta;
+
+	return &imeta->meta;
 }
 
 static struct argv_meta * argv_get(