s3-builtin: Add missing builtin groups.