Move struct match out of varying_matches and rename to varying_assignment.