Cleanup S3 model methods to better deal with missing buckets.