Cleaned up the code a bit, removed the last remnants of s3 expressions from the previous constraint solver.