uct/tree.h: Rearrange declarations a bit