Separate traverse to enter & leave. Fixes. All tests pass now.