One final round of fixup/cleanup.

Not working.

Signed-off-by: Ronald G. Minnich <rminnich@google.com>