Partial extension of the grammar to get nearer to a function definition