rearranged code between lexicon.clj and lexiconfn.clj to make lexicon easier to edit by humans.