Revised parser.