Issue #26156: Make expressions grammar description more semantically correct.