Move more code to traverser.