Remove some of the explicit dependency to Option in Traverser