Incremental commit before refactoring guide.