We have tried a number of different ideas in the matcher and now it is time to clean up the code.
To be decided in code review(s).