Jason's fix had more to do with symbols rather than shapes of trees but we can merge that pull request before this one to be sure that tests pass.