A bit of refactoring around (subvec)