Plug some holes in our structs by rearranging a few fields. This is was done looking at pahole output.