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