Improved CBinaryManager::FindBinary()