Small cleanup for S3 StorageType.  Note that it still needs a ton more cleanup.