Improve constraint tuples (Trac #10451)