[vector-api] Minor clean-ups

These clean-ups are the other half of #1453 that cannot be backported to `master`.