Use a more semantic matcher