DRYing S3 Client a little (no functional changes)