Intermediate commit -- fighting demons in the middle of code refactoring hell