Give Vocabulary sensible ids
Tweaks to import commands to respect behaviour of the other types.

This means you have to create the scope yourself manually, but that's
at least possible now.