EvaluatableExpression changes

EvaluatableExpressions are now created prior to calling KeyWrapper to
avoid multiple call to the same method