Target refactoring.