[9246] Move more values from `data` to own fields.