diff --git a/src/reader2/DExpectExprSsm.cpp b/src/reader2/DExpectExprSsm.cpp
index 49e95296..66eb41cd 100644
--- a/src/reader2/DExpectExprSsm.cpp
+++ b/src/reader2/DExpectExprSsm.cpp
@@ -248,7 +248,7 @@ namespace xo {
             auto f64o = DFloat::box<AGCObject>(p_psm->expr_alloc(),
                                                tk.f64_value());
 
-            auto expr = with_facet<AExpression>::mkobj(DConstant::make(p_psm->expr_alloc(), f64o));
+            auto expr = DConstant::make(p_psm->expr_alloc(), f64o);
 
             // DProgressSsm responsible for resolving cases like
             //   1.9,
diff --git a/src/reader2/DExprSeqState.cpp b/src/reader2/DExprSeqState.cpp
index d6037908..e926565d 100644
--- a/src/reader2/DExprSeqState.cpp
+++ b/src/reader2/DExprSeqState.cpp
@@ -290,8 +290,7 @@ namespace xo {
                     DString * dstr = DString::from_cstr(p_psm->expr_alloc(),
                                                         tk.text().c_str());
                     obj<AGCObject,DString> str(dstr);
-                    auto * dconst = DConstant::make(p_psm->expr_alloc(), str);
-                    obj<AExpression,DConstant> expr(dconst);
+                    obj<AExpression,DConstant> expr = DConstant::make(p_psm->expr_alloc(), str);
 
                     DProgressSsm::start(p_psm->parser_alloc(),
                                         expr,
@@ -319,8 +318,7 @@ namespace xo {
                 {
                     auto f64o = DFloat::box<AGCObject>(p_psm->expr_alloc(),
                                                        tk.f64_value());
-                    auto * dconst = DConstant::make(p_psm->expr_alloc(), f64o);
-                    auto expr = with_facet<AExpression>::mkobj(dconst);
+                    auto expr = DConstant::make(p_psm->expr_alloc(), f64o);
 
                     DProgressSsm::start(p_psm->parser_alloc(),
                                         expr,
@@ -348,8 +346,7 @@ namespace xo {
                 {
                     auto i64o = DFloat::box<AGCObject>(p_psm->expr_alloc(),
                                                        tk.i64_value());
-                    auto * dconst = DConstant::make(p_psm->expr_alloc(), i64o);
-                    auto expr = with_facet<AExpression>::mkobj(dconst);
+                    auto expr = DConstant::make(p_psm->expr_alloc(), i64o);
 
                     DProgressSsm::start(p_psm->parser_alloc(),
                                         expr,
@@ -377,8 +374,7 @@ namespace xo {
                 {
                     auto dvalue = DBoolean::box<AGCObject>(p_psm->expr_alloc(),
                                                            tk.bool_value());
-                    auto * dconst = DConstant::make(p_psm->expr_alloc(), dvalue);
-                    auto expr = with_facet<AExpression>::mkobj(dconst);
+                    auto expr = DConstant::make(p_psm->expr_alloc(), dvalue);
 
                     DProgressSsm::start(p_psm->parser_alloc(),
                                         expr,
diff --git a/src/reader2/DProgressSsm.cpp b/src/reader2/DProgressSsm.cpp
index 830dd30e..cfed858f 100644
--- a/src/reader2/DProgressSsm.cpp
+++ b/src/reader2/DProgressSsm.cpp
@@ -9,6 +9,9 @@
 #include "DExpectExprSsm.hpp"
 #include "ssm/ISyntaxStateMachine_DExpectExprSsm.hpp"
 
+
+#include <xo/expression2/DConstant.hpp>
+#include <xo/expression2/detail/IExpression_DConstant.hpp>
 #ifdef NOT_YET
 #include "DApplySsm.hpp"
 #include "ssm/ISyntaxStateMachine_DApplySsm.hpp"