Updated for latest lifetime changes.