Factored List out of Lexicon and fixed #21.