Added better "default arrow" handling