Constraint solving is working much better now.