r25410: Use C99 struct initialization.