This patch removes the last batch of forward references from the tree,
moving the target command registration routines to the end of the file.