Improved constraint-toggle behavior.