More rewrite into vectors