Index: apps/app_rpt.c
===================================================================
--- apps/app_rpt.c	(revision 101580)
+++ apps/app_rpt.c	(working copy)
@@ -1090,7 +1090,7 @@
 	case CLI_GENERATE:
 		return NULL;
 	}
-	if (a->argc != 4)
+	if (a->argc != e->args)
 		return CLI_SHOWUSAGE;
 	newlevel = myatoi(a->argv[3]);
 	if ((newlevel < 0) || (newlevel > 7))
Index: apps/app_minivm.c
===================================================================
--- apps/app_minivm.c	(revision 101580)
+++ apps/app_minivm.c	(working copy)
@@ -2604,7 +2604,7 @@
 		return NULL;
 	}
 
-	if (a->argc != 3)
+	if (a->argc != e->args)
 		return CLI_SHOWUSAGE;
 
 	AST_LIST_LOCK(&minivm_zones);
Index: apps/app_voicemail.c
===================================================================
--- apps/app_voicemail.c	(revision 101580)
+++ apps/app_voicemail.c	(working copy)
@@ -7824,7 +7824,7 @@
 		return NULL;
 	}
 
-	if (a->argc != 3)
+	if (a->argc != e->args)
 		return CLI_SHOWUSAGE;
 
 	AST_LIST_LOCK(&zones);
@@ -7856,7 +7856,7 @@
 		return NULL;
 	}
 
-	if (a->argc != 2)
+	if (a->argc != e->args)
 		return CLI_SHOWUSAGE;
 
 	ast_cli(a->fd, "Reloading voicemail configuration...\n");	
Index: apps/app_playback.c
===================================================================
--- apps/app_playback.c	(revision 101580)
+++ apps/app_playback.c	(working copy)
@@ -374,7 +374,7 @@
 	if (a->argc == 2) {
 		ast_cli(a->fd, "say mode is [%s]\n", old_mode);
 		return CLI_SUCCESS;
-	} else if (a->argc != 3)
+	} else if (a->argc != e->args)
 		return CLI_SHOWUSAGE;
 	mode = a->argv[2];
 	if (!strcmp(mode, old_mode))