Fix some broken things after integrating pigeon parser demo