Merge much of the StrictVocabulary functionality into Vocabulary, including support for label_for and comment_for, as defined using options to property.