Revert gratuitous reordering of struct macro contents. (If a small amount of structure padding appears, who cares? It's more important that related elements are grouped together.)

#define C(x) //**/* x */**//
C(3)
C(abc /* def */ ghi)

#define D(x) ///**/**/**///**/* x */**///**/**/**///
D(3)
D(abc /* def */ ghi)