FIXUP: Identify interfaces by their type, not hash key.