Improved handling of empty bodies.