Improved OperatorSearch().