Some more consistency conversions into the C style of expressing structs