r24867: Avoid anonymous struct. Patch from Brad Hards.