Fixed sub-class issue with ExpressionConverter.
More updates.