Arrowhead refactoring

As does this.