Copier refactorings