Yes, I think so. I try to keep knowledge of specific Expression classes and Expression Type values out of AbstractExpression.