Some more optimization refactors for the node graphing