Replace hash maps and sets with indexmap
equivalents
#2685
+253
−165
Merged