Remove `Matcher`s
Workaround to have doc comments desugared only in macros
Add tests