[MERGE] More explicit use of Tree.get_root_id()

[Martin Pool]

I was going to say... existing different ways to get this would be
better combined into an explicit method.