Added support for search/match in the type checking.