Fix new lifetime warnings.