fix import cycle
arrows: some bug fixes, remove m parameter from ArrowOpts (doesn't compile)