Update the parser

And merged it with the edited version we had. It seems that this extra
line is the only thing that changed.