Merge #7874: Improve AlreadyHave