Updates for deeper generational check

Not generalized for self-iteration yet.