[geometry] Finetuned robustness fixes of this weekend and fixed (again) for case #ggl_list_20110820_christophe