Task #11822: Rearrange geocoder to deal with Oracle idiocy