gh-106140: Reorder some fields to facilitate out-of-process inspection (GH-106143)

(cherry picked from commit 2d5a1c2)

Co-authored-by: Pablo Galindo Salgado <[email protected]>
Signed-off-by: Pablo Galindo <[email protected]>

Author: pablogsal