Traversal refactor part II.  Not yet done.