amalgamate match_item_chosen into match_item_choice (quite trivial in fact)