Remove unused .add methods, and show the source_pkg_match in the debug output
Always show all the matchers in the debug output