move OptionOwner out to leaves