Fix problem in vocabulary loading and generation and regenerate vocabularies.