Issue 436: Operator statement wrapper was missing