Adapted to changes in the way the core creates expression evaluation objects
Adapted to reorganization of the conversion service