@rough-minister-58256: If removing DescendantAddresses from that check looks like it will require a lot of refactoring, I'm fine with a TODO pointing to a github issue. i can take a swing at it post commit.