Updates after extracting Operator.
Fix regression.