A bit more refactoring of multipart uploads