(RUI6-E018): Apply new conventions for glyph granularity.