Update to reflect make_assignment_kernel change