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