Some TODOs around map.values having dups, and having more optimised
fetch of Map entrySet