Bootstrap refactoring.