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