C++ification of geolocation code ~60% of the way through.