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