Bit more refactoring for NodeStateStore construction; almost complete