AlreadyVisited refactoring redone after previous "amend previous commit"
failed.