Make lifetimes explicit, as required in latest updates to rust