Refactor
Properly re-enable emplace calls.