Clean up use of Node a little.