* Change ExpressionConvertableToType to more closely match map behavior of