Attached is an additional patch, as well as a new, rebased patch.
This includes changes responsive to Álvaro Herrera's commentary aboutthe SET CONSTRAINTS manual page.
Nico--