Minor tweaks to official-lookin' output.