Parser adapted to new lexer. Lexer got stronger.

Change-Id: I10d7b3ad32156dc8bf2f609b8a9c088a1c6555a7