Switching to new unordered_map insert style