Final editorial changes before merge.