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