Issue #3196650: Code clean-up

James Scott requested to merge issue/s3fs_cors-3196650:3196650-code-clean-up into 8.x-1.x May 28, 2021