Fix order of struct members in generated output.