Final changes before making exp lambdas more granular