diff.c: factor advance_or_nullify out of mark_color_as_moved