Fix tuple handling in clauses