Squash deprecated_owned_vector warnings