Tidy up arrow code and tests. Fix re-instating arrows.