fdc: reduce number of pick_geometry arguments