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