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