Fix more lifetime issues.