Some slight tweaks for bug #8365.