First step of completion refactoring.