Change glyph expander to preserve components