Further work on evaluation of lambdas and function cals