Range Analysis refactoring partial commit