(CB02412): Apply new conventions for glyph granularity.