Here's a small set of patches that switch the code to use C99
desiginated initializers. Patches are against 2.5.42.