should both of these changes in gen_v3_to_unified_match be made to gen_v2_to_unified_match?