Arrow refactorings started