Refactor some INode to IExpressionNode