Working snapshot of refinement of parser.