Refactor expand_vec_perm