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