Remove kludgy imports from vec! macro