Fix lifetime issue causing buildbot failures.