(o-GT-07490): Apply new conventions for glyph granularity.