Better arrow handling.