No longer relying on undefined behaviour when adding entries to unordered_map. Tests now passed on both g++ and clang++.