Make matchers more lightweight and add support for descriptions
Remove arguments which are no longer needed