Take advantage of the new mechanism to validate x-match.