Buildbot debugging of 0d0b9010...

Buildbot debugging of 0d0b9010 (lambda/function_ref lifetime issues)

This is failing on several buildbots with some inexplicable (to me,
right now) crashes. Let's see if this change is adequate to unblock the
buildbots & further understanding can be gained later.