more careful treatment of single-shot lambdas