Slight copy adjustments for the last merge.