fix Issue 10605 - Lambda grammar is not sufficient

Improve Lambda grammar and describe rewrite rule