update s-expr evaluation to use new function calling functions