Repair short_name_candidates

short_name_candidates would return [name] if the object failed
the :only predicate.  If it had an existing short_name, that
should be given precedence.