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