fix dependency on matcher

matcher is now in its own package
This is the only remaining comment. What do you think?