Merge "Minor cleanup of saturation arithmetic code."