Avoid dumping all interfaces to look up one

Slightly intrusive change but needed to avoid code duplication.