Can you add this here:

assert ! USEHORNETQSTORE.isAllowExpression() &&  !USE_JDBC_STORE.isAllowExpression()
        : "rework this before enabling expression";

I fear a bug could crop up otherwise, as IIRC the only reason we don't support expressions now is the xml style won't allow it. And xml styles can change.