[FOLD] Fix make_unique
[WIP] Tidy up NodeStore for C++11