Merge changes to Equals and Equiv into WRawMaps