WIP on moving conversions out of BaseExpression