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