Lifetime guide refactoring

Still a work in progress but interested in early feedback.

https://github.com/mozilla/rust/issues/13987