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