Changed WalkNode argument and WalkEntry call to make less dependent on WalkRoot implementation