Minor improvements to vocab-to-spec