Correct some uses of now-undefined CSS classes.
DRY a little more in htmlify().