Rename Choice::add to Choice::add_entry.