Fix makeMatcher's return value