[vector-api] Miscellaneous clean-ups

Miscellaneous clean-ups. Each one is independent and negotiable :)