Bugfix for guide tree handling, now much more straightforward.