Moving more stuff to composite_node.