More work on new parser.