Move some anonymous embedded pointer fields to anonymous struct fields in the event structs.