Update arrows import.
Extract out non-vector related definitions.