(CU+4A31): Apply new conventions for glyph granularity for components