Adapt to latest parser package changes