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