Unified the code path for OP discovery.