SOem tidy-up on the font-handling approach.