A little bit of refactoring in the geo indexing code.