He should across the board implement ToXContent and all responses should implement is without surrounding start/endObject. I started doing one of them in this PR: #3871 but as @martijnvg pointed out we should have all of them being consistent about it.