Thanks for the explanation. This looks reasonable to me. If there are no other default operations we need to duplicate and you are confident that this works, please merge.