Predictable field order

Follow up to #313