Ensuring retyping reaches the correct leaves