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