Multimap simplification/performance improvements.