More work on quex, now self generates
Minor signature change