Refactor argument matchers to adapters