Refactored discovery to avoid traversals when possible, and to be more direct in handing back discovered, direct relationships.