Massage data for future full GeoJSON compatibility