Reenable rule merging
Slightly improve templates for try or and mergepoint
Unification support for all-fail rules