Adapted API changes for CsgExpression.