Update lifetime parameters to work with the latest rustc