Pull in Map thread-safety improvements.