Applied the same changes to the grammar as in the 4.0 (expose CLAUSE)