Arrowhead refactoring

Final newline missing.