(U-00020B5E): Apply new conventions for glyph granularity; unify