SPARK-4762: Fix token matching for tuple in clause