Convert remaining maps to unordered_maps