Clean up nullability slightly.