Clean up use of Node a little, finish.