Split claim and fail payment functions to be able to skip one hop