(U-00023386): Apply new conventions for glyph granularity.