Final version of ExpressionSet stuff