Clean up use of Node a little, part 2.