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