Another slight output tweak for bug #8355.