Fix handling of optional `body`