2 new structs, removed vg_assert(0)