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