Get rid of dependency on Guava's Multimap

Replace with a hand-written multi-map