The latest wave of refactoring is starting to work.