Removing make_unique (since it's c++14 and not c++11).