Improved glyph labelling.