Just reorganized the code a little before I move into packetizing the traversal.