Replace geo compound w/geo multi; fixes #579