Re-add deftype S3