Fix typeface handling regression.