More refactoring for "put". :cow: