Restore Genlex.

Use a simple substitution in order to avoid the bad parsing of =-.