A few more tweaks to get rid of xml and the googlemaps API v2.