Parser improvement. More lazy eval.