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