Fix problem with state-patches only one level deep.
Reordering constraint code path.
Same constraint works, but very slowly, and constraint solver doesn't know to prefer the value that comes from user input.