Update for grammar to support function with block.