Cleaned up the specialized S3 logic in FileSystems.scala per Eric's comments.