Replaced usages of ValueExpandableMap with the more tested Guava's Multimap.