(U-00020404): Apply new conventions for glyph granularity.