OK, the parser now looks more decent.