Updated c++ spec to move initial variant support earlier. Related stories are  pretty rough.