Started rewriting Context to consist of an ordinary constraint.
And.&& now always returns a simplified constraint.