Yes those two cases make sense. For the latter, you could just make a special case of "If you provide a tag at the top level of a response, we will treat it as this special case of oob-swap with the special merge"