Update comparison values to be consistent with return values.