Fixed inconsistent type checking in some matchers.