When I merged master, it looked to me like some special case that distinguishes between models with children and the rest has since merged into master. I therefore re-assembled the two bits like this, because it seemed to make the most sense. I unfortunately have no idea why the special case is made for models with children.