And in doing so, fix some real errors and remove some unused code
Now match tree merging favors the most specific match possible