Make the UserConstraint parser non-ambiguous. 

Fixes #1159. Depends on #1162 (for unit tests).