Cleanup upload command line interface to be more consistent.