Multimap container refactorings