Address review comments - use ancestors find iterator.