Follow up to r56639: Remove some existence check duplication and fix ApiUpload for...