Reorganized the lexical parser so that the structure makes more sense.