Less lambda, more composition