Remove Operator classes and use closures instead.