Fix lifetime bound errors.

Compiles again on rust master.