Index: uspace/app/tmon/burst_tests.c
===================================================================
--- uspace/app/tmon/burst_tests.c	(revision acb9aa746d589d254c190a7355909bb2c60a1959)
+++ uspace/app/tmon/burst_tests.c	(revision 59958992ca6d1825b8aba765eb68e6e6efeacf91)
@@ -40,4 +40,5 @@
 #include <getopt.h>
 #include <usbdiag_iface.h>
+#include <macros.h>
 #include "commands.h"
 #include "tf.h"
@@ -115,20 +116,19 @@
 	{ .prefix = 'G', .factor = 1ul << 30 },
 	{ .prefix = 'M', .factor = 1ul << 20 },
-	{ .prefix = 'k', .factor = 1ul << 10 },
-	{ /* NULL-terminated */ }
+	{ .prefix = 'k', .factor = 1ul << 10 }
 };
 
 static char * format_size(double size, const char *fmt)
 {
-	int i;
-	for (i = 0; units[i].prefix; ++i) {
+	unsigned i;
+	for (i = 0; i < ARRAY_SIZE(units); ++i) {
 		if (units[i].factor <= size)
 			break;
 	}
 
-	char prefix[2] = { '\0', '\0' };
+	char prefix[] = { '\0', '\0' };
 	double factor = 1;
 
-	if (units[i].prefix) {
+	if (i < ARRAY_SIZE(units)) {
 		prefix[0] = units[i].prefix;
 		factor = units[i].factor;
Index: uspace/app/tmon/main.c
===================================================================
--- uspace/app/tmon/main.c	(revision acb9aa746d589d254c190a7355909bb2c60a1959)
+++ uspace/app/tmon/main.c	(revision 59958992ca6d1825b8aba765eb68e6e6efeacf91)
@@ -36,4 +36,5 @@
 
 #include <stdio.h>
+#include <macros.h>
 #include "commands.h"
 
@@ -82,6 +83,5 @@
 		.description = "Write to isochronous endpoint as fast as possible.",
 		.action = tmon_burst_isoch_out,
-	},
-	{ /* NULL-terminated */ }
+	}
 };
 
@@ -102,6 +102,5 @@
 		.short_name = 's',
 		.description = "Set the data size transferred in a single cycle."
-	},
-	{ /* NULL-terminated */ }
+	}
 };
 
@@ -111,10 +110,10 @@
 	printf("Usage: %s command [device] [options]\n\n", app_name);
 
-	for (int i = 0; commands[i].name; ++i) {
+	for (unsigned i = 0; i < ARRAY_SIZE(commands); ++i) {
 		printf(INDENT "%s - %s\n", commands[i].name, commands[i].description);
 	}
 
 	puts("\n");
-	for (int i = 0; options[i].long_name; ++i) {
+	for (unsigned i = 0; i < ARRAY_SIZE(options); ++i) {
 		printf(INDENT "-%c --%s\n" INDENT INDENT "%s\n", options[i].short_name, options[i].long_name, options[i].description);
 	}
@@ -127,5 +126,5 @@
 	// Find a command to execute.
 	tmon_cmd_t *cmd = NULL;
-	for (int i = 0; argc > 1 && commands[i].name; ++i) {
+	for (unsigned i = 0; argc > 1 && i < ARRAY_SIZE(commands); ++i) {
 		if (str_cmp(argv[1], commands[i].name) == 0) {
 			cmd = commands + i;