Added make_unique and replaced those bits of code using the C++11 form.