[Patch] Refractor Thompson matcher

[Paolo Carlini]

.. no, too many changes, please simply revert the commit ASAP and next 
time please test more carefully before posting.

Thanks,
Paolo.