s4: Add additional 2-letter SID/RID mappings.