Fix several hlint suggestions in S3.hs