WIP: transition to a simpler parser.