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