Merged enforce-constraint:* into one procedure. Perhaps not for the better.