Removed most of the current constraint solver, starting with just s2 expressions.