Partial update to latest rust

I added some lifetime annotations that rustc is now asking for, but there is also a bigger issue that I'm not sure of an easy way to handle, so I'll let you steer that one.

I believe the cause of the errors is this commit: https://github.com/rust-lang/rust/commit/d7de4e9affac24c6e96ae068954480bfa763908c