[Upload] Async upload code cleanups.