Preparation for a refactoring.