Revert "Refactor of macros. Makes it much easier to add new matchers."

This reverts commit 1048b749891ba95089a599c5d44616510ef0db65.