Use mapped types around account data events (#28752)

Use mapped types around account data events (#28752) #8828