Refactor arg matchers