Kill a bunch of newts.
Undo some changes.
Merge pull request #353 from pleroy/New

Replace some newts with make_unique<>