Convert more code to use Operator instead of explicitly handling both