Continuing NodeStateStore refactoring (incomplete)