gallium: rearrange some members to avoid memory holes/padding