Use ido to choose between yas expansions.
Some reorganisation and new options found/set.