Still some refactoring of Range tools.