Final version of ExpressionSet stuff-take2