Tighten up native discovery.