Spec improvements, Lexicon spec.