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