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