v8.4: Fixing one part of #2830 (anomaly "defined twice" due to nested calls to
solve_candidates).

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/branches/v8.4@16164 85f007b7-540e-0410-9357-904b9bb8a0f7