This should be purely NFC, it just fits more obviously in the flow of the code now that we've standardized on the index different approach.
One subtle point - the placement of this above the BaseAlias check is important in the original code as this can return NoAlias even when we can't find a relation between the bases otherwise.
Also added some enhancement TODOs noticed while understanding the existing code.