am 09d8a6e3: Merge "slang: Improve handling of StringMapEntries."

* commit '09d8a6e30264df37071fe1beadf96813463db9a7':
  slang: Improve handling of StringMapEntries.