I had already changed it to not split the empty body, so I think this looks the way you are suggesting.