More work on experimental parser.