Minor cleanup to S3 plugin.