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