Fix: set names not completed if starting with an hyphen
and are equal to current word.
Minor optimisations.