Updates following vector-wrapper include changes in core.

No match.