before the entry for section 8H insert— “ section 8FD (which applies instead of this section where there is entitlement to a downsizing addition), ”, and

in the entry for section 8H, after “ “qualifying residential interest”” insert “, “ qualifying former residential interest ” and “residential property interest” ”.