simplify path type coercion in MatchQuery (#470)