Fix up @cmr's issues with the lifetimes tutorial.