More fixes to the flawed leaf/parent terminology.