Incremental refactoring progress.