More node refactoring.