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