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