Reorganized parser.