Fix generated field order.