[WIP] Tidy up NodeStore for C++11