Missing handling of CHANGE_TYPE_CANCELLED causing another hang.