Minor change to move an embedded structure ahead of some simpler fields.