Add between clauses, and correctly type them.