I'm glad to see that /usr/src/usr.sbin/iostat/iostat.c was finally
fixed, I've been patching it for a long time.

new: (void)printf(" us ni sy in id\n");

vs

old: (void)printf(" us ni sy id\n");

Now if you could just patch /usr/src/usr.bin/systat/iostat.c like this:

--- iostat.c.DIST       Wed Mar 15 13:08:25 1995
+++ iostat.c.new        Wed Mar 15 13:26:53 1995
@@ -174,6 +174,7 @@
        mvwaddstr(wnd, row++, 0, "cpu  user|");
        mvwaddstr(wnd, row++, 0, "     nice|");
        mvwaddstr(wnd, row++, 0, "   system|");
+       mvwaddstr(wnd, row++, 0, "interrupt|");
        mvwaddstr(wnd, row++, 0, "     idle|");
        if (numbers)
                row = numlabels(row + 1);
@@ -265,9 +266,9 @@
        row = 1;
 
        /*
-        * Last CPU state not calculated yet.
+        * Interrupt CPU state not calculated yet.
         */ 
-       for (i = 0; i < CPUSTATES - 1; i++)
+       for (i = 0; i < CPUSTATES; i++)
                stat1(row++, i);
        if (!numbers) {
                row += 2;

We'd have a matched set and I would have one less patch to apply every time
I grab the tarballs.