Analysis refactoring.