Refactor handling of PutOperation/-Result