Finished (?) reimplementing marginal tree traversal.