Index: usr.bin/ypcat/ypcat.c
===================================================================
--- usr.bin/ypcat/ypcat.c
+++ usr.bin/ypcat/ypcat.c
@@ -96,7 +96,7 @@
 	while ((c = getopt(argc, argv, "xd:kt")) != -1)
 		switch (c) {
 		case 'x':
-			for (i=0; i<sizeof ypaliases/sizeof ypaliases[0]; i++)
+			for (i = 0; i < nitems(ypaliases); i++)
 				printf("Use \"%s\" for \"%s\"\n",
 				    ypaliases[i].alias, ypaliases[i].name);
 			exit(0);
@@ -120,8 +120,8 @@
 		yp_get_default_domain(&domain);
 
 	inmap = argv[optind];
-	if (!notrans) {
-		for (i=0; i<sizeof ypaliases/sizeof ypaliases[0]; i++)
+	if (notrans == 0) {
+		for (i = 0; i < nitems(ypaliases); i++)
 			if (strcmp(inmap, ypaliases[i].alias) == 0)
 				inmap = ypaliases[i].name;
 	}
Index: usr.bin/ypwhich/ypwhich.c
===================================================================
--- usr.bin/ypwhich/ypwhich.c
+++ usr.bin/ypwhich/ypwhich.c
@@ -151,7 +151,7 @@
 	while ((c = getopt(argc, argv, "xd:mt")) != -1)
 		switch (c) {
 		case 'x':
-			for (i = 0; i<sizeof ypaliases/sizeof ypaliases[0]; i++)
+			for (i = 0; i < nitems(ypaliases); i++)
 				printf("\"%s\" is an alias for \"%s\"\n",
 					ypaliases[i].alias,
 					ypaliases[i].name);
@@ -169,7 +169,7 @@
 			usage();
 		}
 
-	if (!domnam)
+	if (domnam == NULL)
 		yp_get_default_domain(&domnam);
 
 	if (mode == 0) {
@@ -206,9 +206,11 @@
 
 	if (argv[optind]) {
 		map = argv[optind];
-		for (i = 0; (!notrans) && i<sizeof ypaliases/sizeof ypaliases[0]; i++)
-			if (strcmp(map, ypaliases[i].alias) == 0)
-				map = ypaliases[i].name;
+		if (notrans == 0) {
+			for (i = 0; i < nitems(ypaliases); i++)
+				if (strcmp(map, ypaliases[i].alias) == 0)
+					map = ypaliases[i].name;
+		}
 		r = yp_master(domnam, map, &master);
 		switch (r) {
 		case 0: