Some tweaks specific to OrderedMaps
Merge with custom-collections