(cleanup) Reordered struct fields.