TEIID-2433 tweaking the grammar