Cleaning up some of the S3 stream wrapper code