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