(JU+5307): Apply new conventions for glyph granularity.