Replace some newts with make_unique<>