Updates after rerunning unit tests after the parser code review.