Minor clean-up, and prepping move of node storage to graph contexts.