diff --git a/usr.bin/lsvfs/lsvfs.c b/usr.bin/lsvfs/lsvfs.c
index a0a6acb0b59c..cd56e5ebfbda 100644
--- a/usr.bin/lsvfs/lsvfs.c
+++ b/usr.bin/lsvfs/lsvfs.c
@@ -1,97 +1,102 @@
 /*
  * lsvfs - list loaded VFSes
  * Garrett A. Wollman, September 1994
  * This file is in the public domain.
  *
  */
 
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/mount.h>
 #include <sys/sysctl.h>
 
 #include <err.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #define FMT	"%-32.32s 0x%08x %5d  %s\n"
 #define HDRFMT	"%-32.32s %10s %5.5s  %s\n"
 #define DASHES	"-------------------------------- "	\
 		"---------- -----  ---------------\n"
 
 static struct flaglist {
 	int		flag;
 	const char	str[32]; /* must be longer than the longest one. */
 } fl[] = {
 	{ .flag = VFCF_STATIC, .str = "static", },
 	{ .flag = VFCF_NETWORK, .str = "network", },
 	{ .flag = VFCF_READONLY, .str = "read-only", },
 	{ .flag = VFCF_SYNTHETIC, .str = "synthetic", },
 	{ .flag = VFCF_LOOPBACK, .str = "loopback", },
 	{ .flag = VFCF_UNICODE, .str = "unicode", },
 	{ .flag = VFCF_JAIL, .str = "jail", },
 	{ .flag = VFCF_DELEGADMIN, .str = "delegated-administration", },
 };
 
 static const char *fmt_flags(int);
 
 int
 main(int argc, char **argv)
 {
-  int cnt, rv = 0, i; 
-  struct xvfsconf vfc, *xvfsp;
-  size_t buflen;
-  argc--, argv++;
+	struct xvfsconf vfc, *xvfsp;
+	size_t buflen;
+	int cnt, i, rv = 0;
 
-  printf(HDRFMT, "Filesystem", "Num", "Refs", "Flags");
-  fputs(DASHES, stdout);
+	argc--, argv++;
 
-  if(argc) {
-    for(; argc; argc--, argv++) {
-      if (getvfsbyname(*argv, &vfc) == 0) {
-        printf(FMT, vfc.vfc_name, vfc.vfc_typenum, vfc.vfc_refcount,
-	    fmt_flags(vfc.vfc_flags));
-      } else {
-	warnx("VFS %s unknown or not loaded", *argv);
-        rv++;
-      }
-    }
-  } else {
-    if (sysctlbyname("vfs.conflist", NULL, &buflen, NULL, 0) < 0)
-      err(1, "sysctl(vfs.conflist)");
-    xvfsp = malloc(buflen);
-    if (xvfsp == NULL)
-      errx(1, "malloc failed");
-    if (sysctlbyname("vfs.conflist", xvfsp, &buflen, NULL, 0) < 0)
-      err(1, "sysctl(vfs.conflist)");
-    cnt = buflen / sizeof(struct xvfsconf);
+	printf(HDRFMT, "Filesystem", "Num", "Refs", "Flags");
+	fputs(DASHES, stdout);
 
-    for (i = 0; i < cnt; i++) {
-      printf(FMT, xvfsp[i].vfc_name, xvfsp[i].vfc_typenum,
-	    xvfsp[i].vfc_refcount, fmt_flags(xvfsp[i].vfc_flags));
-    }
-    free(xvfsp);
-  }
+	if (argc > 0) {
+		for(; argc > 0; argc--, argv++) {
+			if (getvfsbyname(*argv, &vfc) == 0) {
+				printf(FMT, vfc.vfc_name, vfc.vfc_typenum,
+				    vfc.vfc_refcount, fmt_flags(vfc.vfc_flags));
+			} else {
+				warnx("VFS %s unknown or not loaded", *argv);
+				rv++;
+			}
+		}
+	} else {
+		if (sysctlbyname("vfs.conflist", NULL, &buflen, NULL, 0) < 0)
+			err(1, "sysctl(vfs.conflist)");
+		xvfsp = malloc(buflen);
+		if (xvfsp == NULL)
+			errx(1, "malloc failed");
+		if (sysctlbyname("vfs.conflist", xvfsp, &buflen, NULL, 0) < 0)
+			err(1, "sysctl(vfs.conflist)");
+		cnt = buflen / sizeof(struct xvfsconf);
+
+		for (i = 0; i < cnt; i++) {
+			printf(FMT, xvfsp[i].vfc_name, xvfsp[i].vfc_typenum,
+			    xvfsp[i].vfc_refcount,
+			    fmt_flags(xvfsp[i].vfc_flags));
+		}
+		free(xvfsp);
+	}
 
-  return rv;
+	return (rv);
 }
 
 static const char *
 fmt_flags(int flags)
 {
 	static char buf[sizeof(struct flaglist) * sizeof(fl)];
 	int i;
 
 	buf[0] = '\0';
-	for (i = 0; i < (int)nitems(fl); i++)
-		if (flags & fl[i].flag) {
+	for (i = 0; i < (int)nitems(fl); i++) {
+		if ((flags & fl[i].flag) != 0) {
 			strlcat(buf, fl[i].str, sizeof(buf));
 			strlcat(buf, ", ", sizeof(buf));
 		}
+	}
+
+	/* Zap the trailing comma + space. */
 	if (buf[0] != '\0')
 		buf[strlen(buf) - 2] = '\0';
 	return (buf);
 }