Get arrows back. (lame)
Further cleanup.