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