Ref no unique ptr

Avoids use of emplace_back(std::move(unique)) where unique is a unique_ptr.

These changes are necessary in order to build without c++11 support.