s4: Switch to S3-style id mapping data types.