I agree with the logic of your calculation. If there was any prior depreciation taken, I'd keep the two halves as separate assets, but that's a matter of personal preference. If the decedent had any passive activity losses suspended with respect to the property, there are sometimes some weird adjustments to basis, too.