Some small changes to the parser.
Made sort example work.